diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index da3f107a..d97f75ee 100644
Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ
diff --git a/.idea/dictionaries/Stardust.xml b/.idea/dictionaries/Stardust.xml
index 30ec0d12..49fb13b7 100644
--- a/.idea/dictionaries/Stardust.xml
+++ b/.idea/dictionaries/Stardust.xml
@@ -1,11 +1,15 @@
 <component name="ProjectDictionaryState">
   <dictionary name="Stardust">
     <words>
+      <w>autojs</w>
       <w>capturer</w>
       <w>dismissable</w>
+      <w>fileprovider</w>
       <w>flowable</w>
+      <w>imgproc</w>
       <w>interruptible</w>
       <w>loopers</w>
+      <w>opencv</w>
       <w>prefill</w>
       <w>scriptable</w>
       <w>storages</w>
diff --git a/app/build.gradle b/app/build.gradle
index 96527d7a..9dceffa8 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,5 +1,9 @@
 apply plugin: 'com.android.application'
-def AAVersion = '4.4.0'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-android-extensions'
+apply plugin: 'com.jakewharton.butterknife'
+
+def AAVersion = '4.5.2'
 def SupportLibVersion = '28.0.0'
 
 configurations.all {
@@ -18,7 +22,7 @@ android {
         targetSdkVersion versions.target
         versionCode versions.appVersionCode
         versionName versions.appVersionName
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
         ndk {
             abiFilters 'armeabi-v7a', 'x86'
@@ -79,7 +83,7 @@ repositories {
 }
 
 dependencies {
-    androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
+    androidTestImplementation('androidx.test.espresso:espresso-core:3.1.1-alpha01', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
     testImplementation 'junit:junit:4.12'
@@ -87,17 +91,17 @@ dependencies {
     annotationProcessor "org.androidannotations:androidannotations:$AAVersion"
     implementation "org.androidannotations:androidannotations-api:$AAVersion"
     // ButterKnife
-    implementation('com.jakewharton:butterknife:8.8.1', {
+    implementation('com.jakewharton:butterknife:9.0.0-rc2', {
         exclude group: 'com.android.support'
     })
-    annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1'
+    annotationProcessor 'com.jakewharton:butterknife-compiler:9.0.0-rc2'
     // Android supports
-    implementation "com.android.support:appcompat-v7:${SupportLibVersion}"
-    implementation "com.android.support:cardview-v7:${SupportLibVersion}"
-    implementation "com.android.support:design:${SupportLibVersion}"
-    implementation 'com.android.support:multidex:1.0.3'
+    implementation 'androidx.appcompat:appcompat:1.0.2'
+    implementation 'androidx.cardview:cardview:1.0.0'
+    implementation 'com.google.android.material:material:1.1.0-alpha01'
+    implementation 'androidx.multidex:multidex:2.0.0'
     // Personal libraries
-    implementation 'com.github.hyb1996:MutableTheme:0.2.2'
+    implementation 'com.github.hyb1996:MutableTheme:1.0.0'
     // Material Dialogs
     implementation('com.afollestad.material-dialogs:core:0.9.2.3', {
         exclude group: 'com.android.support'
@@ -136,7 +140,7 @@ dependencies {
     implementation('com.github.bumptech.glide:glide:4.8.0', {
         exclude group: 'com.android.support'
     })
-    annotationProcessor 'com.github.bumptech.glide:compiler:4.8.0'
+    kapt 'com.github.bumptech.glide:compiler:4.8.0'
     //joda time
     implementation 'joda-time:joda-time:2.9.9'
     // Tasker Plugin
@@ -156,5 +160,4 @@ dependencies {
     implementation project(':automator')
     implementation project(':common')
     implementation project(':autojs')
-    implementation (name: 'ads8', ext: 'aar')
 }
\ No newline at end of file
diff --git a/app/libs/ads8.aar b/app/libs/ads8.aar
deleted file mode 100644
index 4bcbc834..00000000
Binary files a/app/libs/ads8.aar and /dev/null differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 8b24cc0c..816de626 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -14,6 +14,8 @@
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
     <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS"/>
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
+    <uses-permission android:name="android.permission.PACKAGE_USAGE_STATS" />
 
 
     <!-- 非Auto.js运行必需，不会主动申请，某些脚本可以自行申请-->
@@ -29,7 +31,7 @@
         android:name=".App"
         android:allowBackup="false"
         android:icon="@drawable/autojs_material"
-        android:label="@string/_app_name"
+        android:label="@string/app_name"
         android:largeHeap="true"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
@@ -43,7 +45,7 @@
         <activity
             android:name=".ui.splash.SplashActivity"
             android:hardwareAccelerated="true"
-            android:label="@string/_app_name"
+            android:label="@string/app_name"
             android:theme="@style/AppTheme.Splash">
             <intent-filter>
                 <category android:name="android.intent.category.LAUNCHER"/>
@@ -54,7 +56,7 @@
         <activity
             android:name=".ui.main.MainActivity_"
             android:hardwareAccelerated="true"
-            android:label="@string/_app_name"
+            android:label="@string/app_name"
             android:launchMode="singleTask"
             android:theme="@style/AppTheme.FullScreen">
         </activity>
@@ -115,6 +117,10 @@
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_CONFIGURE"/>
             </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.CREATE_SHORTCUT"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
         </activity>
 
         <activity
@@ -158,7 +164,7 @@
             android:name=".external.tasker.PluginActivity"
             android:exported="true"
             android:icon="@drawable/ic_android_eat_js"
-            android:label="@string/_app_name"
+            android:label="@string/app_name"
             android:targetActivity=".external.tasker.TaskPrefEditActivity_"
             tools:ignore="ExportedActivity">
             <intent-filter>
@@ -269,23 +275,9 @@
                 <data android:mimeType="text/plain"/>
             </intent-filter>
         </activity>
-
-        <service
-            android:name=".accessibility.AccessibilityService"
-            android:label="@string/_app_name"
-            android:permission="android.permission.BIND_ACCESSIBILITY_SERVICE">
-            <intent-filter>
-                <action android:name="android.accessibilityservice.AccessibilityService"/>
-            </intent-filter>
-
-            <meta-data
-                android:name="android.accessibilityservice"
-                android:resource="@xml/accessibility_service_config"/>
-        </service>
-
         <service
             android:name="com.stardust.notification.NotificationListenerService"
-            android:label="@string/_app_name"
+            android:label="@string/app_name"
             android:permission="android.permission.BIND_NOTIFICATION_LISTENER_SERVICE">
             <intent-filter>
                 <action android:name="android.service.notification.NotificationListenerService"/>
diff --git a/app/src/main/assets/sample/协程/ui中使用协程/main.js b/app/src/main/assets/sample/协程/ui中使用协程/main.js
new file mode 100644
index 00000000..5baee904
--- /dev/null
+++ b/app/src/main/assets/sample/协程/ui中使用协程/main.js
@@ -0,0 +1,24 @@
+"ui";
+
+ui.layout(
+    <frame bg="#4fc3f7">
+        <text textColor="white" textSize="18sp" layout_gravity="center">
+            UI中使用协程
+        </text>
+    </frame>
+);
+
+continuation.delay(5000);
+if (!requestScreenCapture()) {
+    dialogs.alert("请授予软件截图权限").await();
+}
+
+
+// 退出应用对话框
+ui.emitter.on("back_pressed", function (e) {
+    e.consumed = true;
+    let exit = dialogs.confirm("确定要退出程序").await();
+    if (exit) {
+        ui.finish();
+    }
+});
\ No newline at end of file
diff --git a/app/src/main/assets/sample/协程/ui中使用协程/project.json b/app/src/main/assets/sample/协程/ui中使用协程/project.json
new file mode 100644
index 00000000..8afb2e9c
--- /dev/null
+++ b/app/src/main/assets/sample/协程/ui中使用协程/project.json
@@ -0,0 +1,11 @@
+{
+  "name": "协程UI示例",
+  "main": "main.js",
+  "ignore": [
+    "build"
+  ],
+  "packageName": "com.example.cont.ui",
+  "versionName": "1.0.0",
+  "versionCode": 1,
+  "useFeatures": ["continuation"]
+}
\ No newline at end of file
diff --git a/app/src/main/assets/sample/协程/协程HelloWorld/hello.txt b/app/src/main/assets/sample/协程/协程HelloWorld/hello.txt
new file mode 100644
index 00000000..9be9bcf8
--- /dev/null
+++ b/app/src/main/assets/sample/协程/协程HelloWorld/hello.txt
@@ -0,0 +1 @@
+Nothing
\ No newline at end of file
diff --git a/app/src/main/assets/sample/协程/协程HelloWorld/main.js b/app/src/main/assets/sample/协程/协程HelloWorld/main.js
new file mode 100644
index 00000000..9e93812a
--- /dev/null
+++ b/app/src/main/assets/sample/协程/协程HelloWorld/main.js
@@ -0,0 +1,54 @@
+// 注意，要使用协程这个特性，必须使用项目功能，并且在project.json配置好features属性
+
+
+// delay不同于sleep，不会阻塞当前线程
+function delay(millis) {
+    var cont = continuation.create();
+    setTimeout(()=>{
+        cont.resume();
+    }, millis);
+    cont.await();
+}
+
+// 异步IO例子，在另一个线程读取文件，读取完成后返回当前线程继续执行
+function read(path) {
+    var cont = continuation.create();
+    threads.start(function(){
+        try {
+            cont.resume(files.read(path));
+        }catch(err){
+            cont.resumeError(err);
+        }
+    });
+    return cont.await();
+}
+
+// 使用Promise和协程的例子
+function add(a, b) {
+    return new Promise(function(resolve, reject) {
+        var sum = a + b;
+        resolve(sum);
+    });
+}
+
+toastLog("Hello, Continuation!");
+
+//3秒后发出提示
+setTimeout(()=>{
+    toastLog("3秒后....");
+}, 3000);
+
+// 你可以尝试把delay更换成sleep，看会发生什么！
+delay(6000);
+toastLog("6秒后...");
+
+try {
+    toastLog("读取文件hello.txt: " + read("./hello.txt"));
+}catch(err){
+    console.error(err);
+}
+
+var sum = add(1, 2).await();
+toastLog("1 + 2 = " + sum);
+
+
diff --git a/app/src/main/assets/sample/协程/协程HelloWorld/project.json b/app/src/main/assets/sample/协程/协程HelloWorld/project.json
new file mode 100644
index 00000000..dccfca87
--- /dev/null
+++ b/app/src/main/assets/sample/协程/协程HelloWorld/project.json
@@ -0,0 +1,11 @@
+{
+  "name": "协程HelloWorld",
+  "main": "main.js",
+  "ignore": [
+    "build"
+  ],
+  "packageName": "com.example.cont.helloworld",
+  "versionName": "1.0.0",
+  "versionCode": 1,
+  "useFeatures": ["continuation"]
+}
\ No newline at end of file
diff --git a/app/src/main/assets/sample/图片与图色处理/图片处理.js b/app/src/main/assets/sample/图片与图色处理/图片处理.js
new file mode 100644
index 00000000..654c56ad
--- /dev/null
+++ b/app/src/main/assets/sample/图片与图色处理/图片处理.js
@@ -0,0 +1,142 @@
+"ui";
+
+var url = "https://www.autojs.org/assets/uploads/files/1540386817060-918021-20160416200702191-185324559.jpg";
+var logo = null;
+var currentImg = null;
+
+events.on("exit", function(){
+    if(logo != null){
+        logo.recycle();
+    }
+    if(currentImg != null){
+        currentImg.recycle();
+    }
+});
+
+ui.layout(
+    <vertical>
+        <img id="img" w="250" h="250" url="{{url}}" />
+        <scroll>
+            <vertical>
+                <button id="rotate" text="旋转" />
+                <button id="concat" text="拼接" />
+                <button id="grayscale" text="灰度化" />
+                <button id="binary" text="二值化" />
+                <button id="adaptiveBinary" text="自适应二值化" />
+                <button id="hsv" text="RGB转HSV" />
+                <button id="blur" text="模糊" />
+                <button id="medianBlur" text="中值滤波" />
+                <button id="gaussianBlur" text="高斯模糊" />
+            </vertical>
+        </scroll>
+    </vertical>
+);
+
+//把一张图片设置到图片控件中
+function setImage(img) {
+    ui.run(() => {
+        ui.img.setImageBitmap(img.bitmap);
+        var oldImg = currentImg;
+        //不能立即回收currentImg，因为此时img控件还在使用它，应该在下次消息循环再回收它
+        ui.post(()=>{
+            if(oldImg != null){
+                oldImg.recycle();
+            }
+        });
+        currentImg = img;
+    });
+}
+
+//启动一个处理图片的线程
+var imgProcess = threads.start(function () {
+    setInterval(() => { }, 1000);
+});
+
+//处理图片的函数，把任务交给图片处理线程处理
+function processImg(process) {
+    imgProcess.setTimeout(() => {
+        if (logo == null) {
+            logo = images.load(url);
+        }
+        //处理图片
+        var result = process(logo);
+        //把处理后的图片设置到图片控件中
+        setImage(result);
+    }, 0);
+}
+
+var degress = 0;
+
+ui.rotate.on("click", () => {
+    processImg(img => {
+        degress += 90;
+        //旋转degress角度
+        return images.rotate(img, degress);
+    });
+});
+
+ui.concat.on("click", () => {
+    processImg(img => {
+        if(currentImg == null){
+            toast("请先点击其他按钮，再点击本按钮");
+            return img.clone();
+        }
+        //把currentImg拼接在img右边
+        return images.concat(img, currentImg, "right");
+    });
+});
+
+ui.grayscale.on("click", () => {
+    processImg(img => {
+        //灰度化
+        return images.grayscale(img);
+    });
+});
+
+ui.binary.on("click", () => {
+    processImg(img => {
+        var g = images.grayscale(img);
+        //二值化，取灰度为30到200之间的图片
+        var result = images.threshold(g, 100, 200);
+        g.recycle();
+        return result;
+    });
+});
+
+ui.adaptiveBinary.on("click", () => {
+    processImg(img => {
+        var g = images.grayscale(img);
+        //自适应二值化，最大值为200，块大小为25
+        var result = images.adaptiveThreshold(g, 200, "MEAN_C", "BINARY", 25, 10);
+        g.recycle();
+        return result;
+    });
+});
+
+ui.hsv.on("click", () => {
+    processImg(img => {
+        //RGB转HSV
+        return images.cvtColor(img, "BGR2HSV");
+    });
+});
+
+ui.blur.on("click", () => {
+    processImg(img => {
+        //模糊
+        return images.blur(img, [10, 10]);
+    });
+});
+
+ui.medianBlur.on("click", () => {
+    processImg(img => {
+        //中值滤波
+        return images.medianBlur(img, 5);
+    });
+});
+
+ui.gaussianBlur.on("click", () => {
+    processImg(img => {
+        //高斯模糊
+        return images.gaussianBlur(img, [5, 5]);
+    });
+});
\ No newline at end of file
diff --git a/app/src/main/assets/sample/复杂界面/音乐浏览器.js b/app/src/main/assets/sample/复杂界面/音乐浏览器.js
index f3d6f949..0664fbdc 100644
--- a/app/src/main/assets/sample/复杂界面/音乐浏览器.js
+++ b/app/src/main/assets/sample/复杂界面/音乐浏览器.js
@@ -1,20 +1,39 @@
 "ui";
 
-//音乐文件的后缀名
-var musicExts = [".mp3", ".wma", ".rm", ".wav", ".mid", ".ape", ".flac"];
-//扫描路径
-var path = files.getSdcardPath();
-//保存音乐文件列表的数组
-var musicFiles = [];
+var IconView = (function() {
+    //继承ui.Widget
+    util.extend(IconView, ui.Widget);
+
+    function IconView() {
+        //调用父类构造函数
+        ui.Widget.call(this);
+        //自定义属性color，定义按钮颜色
+        this.defineAttr("icon", (view, name, defaultGetter) => {
+            return this._icon;
+        }, (view, name, value, defaultSetter) => {
+            this._icon = value;
+            view.setImageResource(value);
+        });
+    }
+    IconView.prototype.render = function() {
+        return (
+            <img />
+        );
+    }
+    ui.registerWidget("icon", IconView);
+    return IconView;
+})();
+
+var apps = [];
 
 ui.layout(
     <vertical  bg="#ffffff">
         <list id="files" layout_weight="1">
             <linear bg="?selectableItemBackground">
-                <img src="@drawable/ic_music_note_black_48dp" tint="white" bg="#ff5722" w="50" h="70" margin="16" />
+                <icon icon="{{this.icon}}" w="50" h="70" margin="16" />
                 <vertical>
-                    <text id="name" textSize="16sp" textColor="#000000" text="{{this.name}}" marginTop="16" maxLines="1" ellipsize="end"/>
-                    <text id="path" textSize="13sp" textColor="#929292" text="{{this.path}}" marginTop="8" maxLines="1" ellipsize="end"/>
+                    <text id="name" textSize="16sp" textColor="#000000" text="{{this.appName}}" marginTop="16" maxLines="1" ellipsize="end"/>
+                    <text id="path" textSize="13sp" textColor="#929292" text="{{this.packageName}}" marginTop="8" maxLines="1" ellipsize="end"/>
                 </vertical>
             </linear>
         </list>
@@ -22,38 +41,31 @@ ui.layout(
     </vertical>
 );
 
-ui.files.setDataSource(musicFiles);
+ui.apps.setDataSource(musicFiles);
 
-ui.files.on("item_click", function(item, pos){
-    media.playMusic(item.path, 1);
+ui.apps.on("item_click", function(item, pos){
+    toast(item);
 });
 
 //启动线程来扫描音乐文件
 threads.start(function () {
-    listMuiscFiles(path, musicFiles);
+    listApps(apps);
     ui.run(()=> {
         ui.progressbar.setVisility(8);
     });
 });
 
-function listMuiscFiles(dir, list) {
-    //遍历该文件夹的文件
-    files.listDir(dir).forEach(fileName => {
-        var path = files.join(dir, fileName);
-        //如果是子文件夹则继续扫描子文件夹的文件
-        if (files.isDir(path)) {
-            listMuiscFiles(path, list);
-            return;
-        }
-        for (var i = 0; i < musicExts.length; i++) {
-            //如果文件名的后缀是音乐格式
-            if (fileName.endsWith(musicExts[i])) {
-                //则把它添加到列表中
-                list.push({
-                    name: fileName,
-                    path: path
-                });
-            }
-        }
-    });
+function listApps(apps) {
+    var pm = context.getPackageManager();
+    let list = pm.getInstalledPackages(0);
+    for(let i = 0; i < list.size(); i++){
+        let p = list.get(i);
+        apps.push({
+            appName: p.applicationInfo.loadLabel(pm).toString(),
+            packageName: p.packageName,
+            versionName: p.versionName,
+            versionCode: p.versionCode,
+            icon: p.applicationInfo.loadIcon(pm)
+        });
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/assets/sample/控制台/保存日志.js b/app/src/main/assets/sample/控制台/保存日志.js
new file mode 100644
index 00000000..f93f6cb6
--- /dev/null
+++ b/app/src/main/assets/sample/控制台/保存日志.js
@@ -0,0 +1,7 @@
+console.setGlobalLogConfig({
+    file: "/sdcard/log.txt"
+});
+console.log(1);
+console.log(2);
+console.error(3);
+app.viewFile("/sdcard/log.txt");
diff --git a/app/src/main/assets/sample/控制台/控制台示例.js b/app/src/main/assets/sample/控制台/控制台示例.js
index 6af4d3e4..e70afe40 100644
--- a/app/src/main/assets/sample/控制台/控制台示例.js
+++ b/app/src/main/assets/sample/控制台/控制台示例.js
@@ -6,3 +6,9 @@ console.log("这是黑色");
 console.info("这是红色");
 console.warn("这是蓝色");
 console.error("这是绿色=_=");
+hey();
+
+function hey() {
+    console.trace("打印日志行数");
+}
+
diff --git a/app/src/main/assets/sample/界面控件/自定义控件-带颜色按钮.js b/app/src/main/assets/sample/界面控件/自定义控件-带颜色按钮.js
index 3a7b5167..a53b1921 100644
--- a/app/src/main/assets/sample/界面控件/自定义控件-带颜色按钮.js
+++ b/app/src/main/assets/sample/界面控件/自定义控件-带颜色按钮.js
@@ -1,7 +1,7 @@
 "ui";
 
 var ColoredButton = (function() {
-    //继承至ui.Widget
+    //继承ui.Widget
     util.extend(ColoredButton, ui.Widget);
 
     function ColoredButton() {
diff --git a/app/src/main/java/org/autojs/autojs/App.java b/app/src/main/java/org/autojs/autojs/App.java
deleted file mode 100644
index da2be8ae..00000000
--- a/app/src/main/java/org/autojs/autojs/App.java
+++ /dev/null
@@ -1,177 +0,0 @@
-package org.autojs.autojs;
-
-import android.annotation.SuppressLint;
-import android.content.Context;
-import android.graphics.Bitmap;
-import android.graphics.drawable.Drawable;
-import android.net.Uri;
-import android.support.multidex.MultiDexApplication;
-import android.view.View;
-import android.widget.ImageView;
-
-import com.bumptech.glide.request.target.SimpleTarget;
-import com.bumptech.glide.request.transition.Transition;
-import com.flurry.android.FlurryAgent;
-import com.squareup.leakcanary.LeakCanary;
-import com.stardust.app.GlobalAppContext;
-import com.stardust.autojs.core.ui.inflater.ImageLoader;
-import com.stardust.autojs.core.ui.inflater.util.Drawables;
-import com.stardust.theme.ThemeColor;
-import com.stardust.theme.ThemeColorManager;
-import com.tencent.bugly.Bugly;
-import com.tencent.bugly.crashreport.CrashReport;
-
-import org.autojs.autojs.autojs.AutoJs;
-import org.autojs.autojs.autojs.key.GlobalKeyObserver;
-import org.autojs.autojs.external.receiver.DynamicBroadcastReceivers;
-import org.autojs.autojs.network.GlideApp;
-import org.autojs.autojs.timing.IntentTask;
-import org.autojs.autojs.timing.TimedTaskManager;
-import org.autojs.autojs.timing.TimedTaskScheduler;
-import org.autojs.autojs.tool.CrashHandler;
-import org.autojs.autojs.ui.error.ErrorReportActivity;
-
-import java.lang.ref.WeakReference;
-import java.util.ArrayList;
-
-/**
- * Created by Stardust on 2017/1/27.
- */
-
-public class App extends MultiDexApplication {
-
-    private static final String TAG = "App";
-    private static final String BUGLY_APP_ID = "19b3607b53";
-
-    private static WeakReference<App> instance;
-    private DynamicBroadcastReceivers mDynamicBroadcastReceivers;
-
-    public static App getApp() {
-        return instance.get();
-    }
-
-    public void onCreate() {
-        super.onCreate();
-        GlobalAppContext.set(this);
-        instance = new WeakReference<>(this);
-        setUpStaticsTool();
-        setUpDebugEnvironment();
-        init();
-    }
-
-    public DynamicBroadcastReceivers getDynamicBroadcastReceivers() {
-        return mDynamicBroadcastReceivers;
-    }
-
-    private void setUpStaticsTool() {
-        if (BuildConfig.DEBUG)
-            return;
-        new FlurryAgent.Builder()
-                .withLogEnabled(BuildConfig.DEBUG)
-                .build(this, "D42MH48ZN4PJC5TKNYZD");
-    }
-
-
-    @Override
-    protected void attachBaseContext(Context base) {
-        super.attachBaseContext(base);
-    }
-
-    private void setUpDebugEnvironment() {
-        Bugly.isDev = false;
-        CrashHandler crashHandler = new CrashHandler(ErrorReportActivity.class);
-
-        CrashReport.UserStrategy strategy = new CrashReport.UserStrategy(getApplicationContext());
-        strategy.setCrashHandleCallback(crashHandler);
-
-        CrashReport.initCrashReport(getApplicationContext(), BUGLY_APP_ID, false, strategy);
-
-        crashHandler.setBuglyHandler(Thread.getDefaultUncaughtExceptionHandler());
-        Thread.setDefaultUncaughtExceptionHandler(crashHandler);
-        if (LeakCanary.isInAnalyzerProcess(this)) {
-            // This process is dedicated to LeakCanary for heap analysis.
-            // You should not init your app in this process.
-            return;
-        }
-        //LeakCanary.install(this);
-
-    }
-
-    private void init() {
-        ThemeColorManager.setDefaultThemeColor(new ThemeColor(getResources().getColor(R.color.colorPrimary), getResources().getColor(R.color.colorPrimaryDark), getResources().getColor(R.color.colorAccent)));
-        ThemeColorManager.init(this);
-        AutoJs.initInstance(this);
-        if (Pref.isRunningVolumeControlEnabled()) {
-            GlobalKeyObserver.init();
-        }
-        setupDrawableImageLoader();
-        TimedTaskScheduler.checkTasksRepeatedlyIfNeeded(this);
-        initDynamicBroadcastReceivers();
-    }
-
-    @SuppressLint("CheckResult")
-    private void initDynamicBroadcastReceivers() {
-        mDynamicBroadcastReceivers = new DynamicBroadcastReceivers(this);
-        TimedTaskManager.getInstance().getAllIntentTasks()
-                .filter(task -> task.getAction() != null)
-                .map(IntentTask::getAction)
-                .collectInto(new ArrayList<String>(), ArrayList::add)
-                .subscribe(list -> mDynamicBroadcastReceivers.register(list),
-                        Throwable::printStackTrace);
-    }
-
-    private void setupDrawableImageLoader() {
-        Drawables.setDefaultImageLoader(new ImageLoader() {
-            @Override
-            public void loadInto(ImageView imageView, Uri uri) {
-                GlideApp.with(App.this)
-                        .load(uri)
-                        .into(imageView);
-            }
-
-            @Override
-            public void loadIntoBackground(View view, Uri uri) {
-                GlideApp.with(App.this)
-                        .load(uri)
-                        .into(new SimpleTarget<Drawable>() {
-                            @Override
-                            public void onResourceReady(Drawable resource, Transition<? super Drawable> transition) {
-                                view.setBackground(resource);
-                            }
-                        });
-            }
-
-            @Override
-            public Drawable load(View view, Uri uri) {
-                throw new UnsupportedOperationException();
-            }
-
-            @Override
-            public void load(View view, Uri uri, DrawableCallback drawableCallback) {
-                GlideApp.with(App.this)
-                        .load(uri)
-                        .into(new SimpleTarget<Drawable>() {
-                            @Override
-                            public void onResourceReady(Drawable resource, Transition<? super Drawable> transition) {
-                                drawableCallback.onLoaded(resource);
-                            }
-                        });
-            }
-
-            @Override
-            public void load(View view, Uri uri, BitmapCallback bitmapCallback) {
-                GlideApp.with(App.this)
-                        .asBitmap()
-                        .load(uri)
-                        .into(new SimpleTarget<Bitmap>() {
-                            @Override
-                            public void onResourceReady(Bitmap resource, Transition<? super Bitmap> transition) {
-                                bitmapCallback.onLoaded(resource);
-                            }
-                        });
-            }
-        });
-    }
-
-
-}
diff --git a/app/src/main/java/org/autojs/autojs/App.kt b/app/src/main/java/org/autojs/autojs/App.kt
new file mode 100644
index 00000000..ff06a8d7
--- /dev/null
+++ b/app/src/main/java/org/autojs/autojs/App.kt
@@ -0,0 +1,177 @@
+package org.autojs.autojs
+
+import android.annotation.SuppressLint
+import android.content.Context
+import android.content.Intent
+import android.graphics.Bitmap
+import android.graphics.drawable.Drawable
+import android.net.Uri
+import androidx.multidex.MultiDexApplication
+import android.view.View
+import android.widget.ImageView
+import androidx.localbroadcastmanager.content.LocalBroadcastManager
+import com.bumptech.glide.Glide
+import com.bumptech.glide.request.target.SimpleTarget
+import com.bumptech.glide.request.transition.Transition
+import com.flurry.android.FlurryAgent
+import com.squareup.leakcanary.LeakCanary
+import com.stardust.app.GlobalAppContext
+import com.stardust.autojs.core.ui.inflater.ImageLoader
+import com.stardust.autojs.core.ui.inflater.util.Drawables
+import com.stardust.theme.ThemeColor
+import com.tencent.bugly.Bugly
+import com.tencent.bugly.crashreport.CrashReport
+import org.autojs.autojs.autojs.AutoJs
+import org.autojs.autojs.autojs.key.GlobalKeyObserver
+import org.autojs.autojs.external.receiver.DynamicBroadcastReceivers
+import org.autojs.autojs.theme.ThemeColorManagerCompat
+import org.autojs.autojs.timing.TimedTaskManager
+import org.autojs.autojs.timing.TimedTaskScheduler
+import org.autojs.autojs.tool.CrashHandler
+import org.autojs.autojs.ui.error.ErrorReportActivity
+import java.lang.ref.WeakReference
+import java.util.*
+
+/**
+ * Created by Stardust on 2017/1/27.
+ */
+
+class App : MultiDexApplication() {
+    lateinit var dynamicBroadcastReceivers: DynamicBroadcastReceivers
+        private set
+
+    override fun onCreate() {
+        super.onCreate()
+        GlobalAppContext.set(this)
+        instance = WeakReference(this)
+        setUpStaticsTool()
+        setUpDebugEnvironment()
+        init()
+    }
+
+    private fun setUpStaticsTool() {
+        if (BuildConfig.DEBUG)
+            return
+        FlurryAgent.Builder()
+                .withLogEnabled(BuildConfig.DEBUG)
+                .build(this, "D42MH48ZN4PJC5TKNYZD")
+    }
+
+    private fun setUpDebugEnvironment() {
+        Bugly.isDev = false
+        val crashHandler = CrashHandler(ErrorReportActivity::class.java)
+
+        val strategy = CrashReport.UserStrategy(applicationContext)
+        strategy.setCrashHandleCallback(crashHandler)
+
+        CrashReport.initCrashReport(applicationContext, BUGLY_APP_ID, false, strategy)
+
+        crashHandler.setBuglyHandler(Thread.getDefaultUncaughtExceptionHandler())
+        Thread.setDefaultUncaughtExceptionHandler(crashHandler)
+        if (LeakCanary.isInAnalyzerProcess(this)) {
+            // This process is dedicated to LeakCanary for heap analysis.
+            // You should not init your app in this process.
+            return
+        }
+        //LeakCanary.install(this);
+
+    }
+
+    private fun init() {
+        ThemeColorManagerCompat.init(this, ThemeColor(resources.getColor(R.color.colorPrimary), resources.getColor(R.color.colorPrimaryDark), resources.getColor(R.color.colorAccent)))
+        AutoJs.initInstance(this)
+        if (Pref.isRunningVolumeControlEnabled()) {
+            GlobalKeyObserver.init()
+        }
+        setupDrawableImageLoader()
+        TimedTaskScheduler.checkTasksRepeatedlyIfNeeded(this)
+        initDynamicBroadcastReceivers()
+    }
+
+    @SuppressLint("CheckResult")
+    private fun initDynamicBroadcastReceivers() {
+        dynamicBroadcastReceivers = DynamicBroadcastReceivers(this)
+        val localActions = ArrayList<String>()
+        val actions = ArrayList<String>()
+        TimedTaskManager.getInstance().allIntentTasks
+                .filter { task -> task.action != null }
+                .doOnComplete {
+                    if (localActions.isNotEmpty()) {
+                        dynamicBroadcastReceivers.register(localActions, true)
+                    }
+                    if (actions.isNotEmpty()) {
+                        dynamicBroadcastReceivers.register(actions, false)
+                    }
+                    LocalBroadcastManager.getInstance(applicationContext).sendBroadcast(Intent(
+                            DynamicBroadcastReceivers.ACTION_STARTUP
+                    ))
+                }
+                .subscribe({
+                    if (it.isLocal) {
+                        localActions.add(it.action)
+                    } else {
+                        actions.add(it.action)
+                    }
+                }, { it.printStackTrace() })
+
+
+    }
+
+    private fun setupDrawableImageLoader() {
+        Drawables.setDefaultImageLoader(object : ImageLoader {
+            override fun loadInto(imageView: ImageView, uri: Uri) {
+                Glide.with(imageView)
+                        .load(uri)
+                        .into(imageView)
+            }
+
+            override fun loadIntoBackground(view: View, uri: Uri) {
+                Glide.with(view)
+                        .load(uri)
+                        .into(object : SimpleTarget<Drawable>() {
+                            override fun onResourceReady(resource: Drawable, transition: Transition<in Drawable>?) {
+                                view.background = resource
+                            }
+                        })
+            }
+
+            override fun load(view: View, uri: Uri): Drawable {
+                throw UnsupportedOperationException()
+            }
+
+            override fun load(view: View, uri: Uri, drawableCallback: ImageLoader.DrawableCallback) {
+                Glide.with(view)
+                        .load(uri)
+                        .into(object : SimpleTarget<Drawable>() {
+                            override fun onResourceReady(resource: Drawable, transition: Transition<in Drawable>?) {
+                                drawableCallback.onLoaded(resource)
+                            }
+                        })
+            }
+
+            override fun load(view: View, uri: Uri, bitmapCallback: ImageLoader.BitmapCallback) {
+                Glide.with(view)
+                        .asBitmap()
+                        .load(uri)
+                        .into(object : SimpleTarget<Bitmap>() {
+                            override fun onResourceReady(resource: Bitmap, transition: Transition<in Bitmap>?) {
+                                bitmapCallback.onLoaded(resource)
+                            }
+                        })
+            }
+        })
+    }
+
+    companion object {
+
+        private val TAG = "App"
+        private val BUGLY_APP_ID = "19b3607b53"
+
+        private lateinit var instance: WeakReference<App>
+
+        val app: App
+            get() = instance.get()!!
+    }
+
+
+}
diff --git a/app/src/main/java/org/autojs/autojs/Constants.java b/app/src/main/java/org/autojs/autojs/Constants.java
index 48521dda..0995244c 100644
--- a/app/src/main/java/org/autojs/autojs/Constants.java
+++ b/app/src/main/java/org/autojs/autojs/Constants.java
@@ -6,17 +6,5 @@ package org.autojs.autojs;
 
 public final class Constants {
 
-    public static final int AD_TYPE_RANDOM = 0;
-    public static final int AD_TYPE_NEWS = 1;
-    public static final int AD_TYPE_SOCIAL = 2;
-    public static final int AD_TYPE_ANIMATION = 3;
-    public static final int AD_TYPE_GAMES = 4;
-
-    public static final int UMENG_ID_NEWS = 36787;
-    public static final int UMENG_ID_SOCIAL = 36785;
-    public static final int UMENG_ID_ANIMATION = 36781;
-    public static final int UMENG_ID_GAMES = 36615;
-
-    public static final int[] UMENG_IDS = {UMENG_ID_NEWS, UMENG_ID_SOCIAL, UMENG_ID_ANIMATION, UMENG_ID_GAMES};
 
 }
diff --git a/app/src/main/java/org/autojs/autojs/Pref.java b/app/src/main/java/org/autojs/autojs/Pref.java
index 90a2c01f..776db678 100644
--- a/app/src/main/java/org/autojs/autojs/Pref.java
+++ b/app/src/main/java/org/autojs/autojs/Pref.java
@@ -7,8 +7,10 @@ import android.preference.PreferenceManager;
 
 import com.stardust.app.GlobalAppContext;
 import com.stardust.autojs.runtime.accessibility.AccessibilityConfig;
+import com.stardust.theme.ThemeColorManager;
 
 import org.autojs.autojs.autojs.key.GlobalKeyObserver;
+import org.autojs.autojs.theme.ThemeColorManagerCompat;
 
 import java.io.File;
 import java.util.concurrent.TimeUnit;
@@ -21,8 +23,6 @@ public class Pref {
     private static final SharedPreferences DISPOSABLE_BOOLEAN = GlobalAppContext.get().getSharedPreferences("DISPOSABLE_BOOLEAN", Context.MODE_PRIVATE);
     private static final String KEY_SERVER_ADDRESS = "KEY_SERVER_ADDRESS";
     private static final String KEY_SHOULD_SHOW_ANNUNCIATION = "KEY_SHOULD_SHOW_ANNUNCIATION";
-    private static final String KEY_FIRST_SHOW_AD = "KEY_FIRST_SHOW_AD";
-    private static final String KEY_LAST_SHOW_AD_MILLIS = "KEY_LAST_SHOW_AD_MILLIS";
     private static final String KEY_FLOATING_MENU_SHOWN = "KEY_FLOATING_MENU_SHOWN";
     private static final String KEY_EDITOR_THEME = "editor.theme";
     private static final String KEY_EDITOR_TEXT_SIZE = "editor.textSize";
@@ -55,6 +55,10 @@ public class Pref {
         return b;
     }
 
+    public static boolean isNightModeEnabled() {
+        return def().getBoolean(getString(R.string.key_night_mode), false);
+    }
+
     public static boolean isFirstGoToAccessibilitySetting() {
         return getDisposableBoolean("isFirstGoToAccessibilitySetting", true);
     }
@@ -99,34 +103,6 @@ public class Pref {
         return getDisposableBoolean(KEY_SHOULD_SHOW_ANNUNCIATION, true);
     }
 
-    public static boolean shouldShowAd() {
-        if (isFirstDay()) {
-            return false;
-        }
-        String adShowingMode = def().getString(getString(R.string.key_ad_showing_mode), "Default");
-        switch (adShowingMode) {
-            case "Default":
-                return true;
-            case "OncePerDay":
-                long lastShowMillis = def().getLong(KEY_LAST_SHOW_AD_MILLIS, 0);
-                if (System.currentTimeMillis() - lastShowMillis < TimeUnit.DAYS.toMillis(1)) {
-                    return false;
-                }
-                def().edit().putLong(KEY_LAST_SHOW_AD_MILLIS, System.currentTimeMillis()).apply();
-                return true;
-        }
-        return true;
-    }
-
-    public static int getAdType() {
-        try {
-            return Integer.parseInt(def().getString(getString(R.string.key_ad_type), String.valueOf(Constants.AD_TYPE_RANDOM)));
-        } catch (Exception e) {
-            e.printStackTrace();
-            return Constants.AD_TYPE_RANDOM;
-        }
-    }
-
     private static boolean isFirstDay() {
         long firstUsingMillis = def().getLong("firstUsingMillis", -1);
         if (firstUsingMillis == -1) {
@@ -136,16 +112,6 @@ public class Pref {
         return System.currentTimeMillis() - firstUsingMillis <= TimeUnit.DAYS.toMillis(1);
     }
 
-    public static boolean isFirstShowingAd() {
-        return getDisposableBoolean(KEY_FIRST_SHOW_AD, true);
-    }
-
-    public static boolean isRecordWithRootEnabled() {
-        //always return true after version 3.0.0
-        //record without root has been deprecated
-        return true;
-    }
-
     public static boolean isRecordToastEnabled() {
         return def().getBoolean(getString(R.string.key_record_toast), true);
     }
diff --git a/app/src/main/java/org/autojs/autojs/accessibility/AccessibilityService.java b/app/src/main/java/org/autojs/autojs/accessibility/AccessibilityService.java
deleted file mode 100644
index 3dfadd33..00000000
--- a/app/src/main/java/org/autojs/autojs/accessibility/AccessibilityService.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package org.autojs.autojs.accessibility;
-
-
-import android.accessibilityservice.AccessibilityServiceInfo;
-
-import org.autojs.autojs.Pref;
-
-/**
- * Created by Stardust on 2017/8/14.
- */
-
-public class AccessibilityService extends com.stardust.view.accessibility.AccessibilityService {
-
-    @Override
-    protected void onServiceConnected() {
-        AccessibilityServiceInfo serviceInfo = getServiceInfo();
-        if (Pref.isStableModeEnabled()) {
-            serviceInfo.flags &= ~AccessibilityServiceInfo.FLAG_INCLUDE_NOT_IMPORTANT_VIEWS;
-        } else {
-            serviceInfo.flags |= AccessibilityServiceInfo.FLAG_INCLUDE_NOT_IMPORTANT_VIEWS;
-        }
-        setServiceInfo(serviceInfo);
-        super.onServiceConnected();
-    }
-
-
-}
diff --git a/app/src/main/java/org/autojs/autojs/autojs/AutoJs.java b/app/src/main/java/org/autojs/autojs/autojs/AutoJs.java
index 39300dbe..c85ed7a9 100644
--- a/app/src/main/java/org/autojs/autojs/autojs/AutoJs.java
+++ b/app/src/main/java/org/autojs/autojs/autojs/AutoJs.java
@@ -6,18 +6,16 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.os.Looper;
-import android.support.v4.content.LocalBroadcastManager;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 
 import com.stardust.app.GlobalAppContext;
-import com.stardust.autojs.core.console.GlobalStardustConsole;
+import com.stardust.autojs.core.console.GlobalConsole;
 import com.stardust.autojs.runtime.ScriptRuntime;
 import com.stardust.autojs.runtime.accessibility.AccessibilityConfig;
 import com.stardust.autojs.runtime.api.AppUtils;
 import com.stardust.autojs.runtime.exception.ScriptException;
-import com.stardust.autojs.runtime.api.Console;
 import com.stardust.autojs.runtime.exception.ScriptInterruptedException;
 
-import org.autojs.autojs.App;
 import org.autojs.autojs.BuildConfig;
 import org.autojs.autojs.Pref;
 import org.autojs.autojs.R;
@@ -28,10 +26,8 @@ import org.autojs.autojs.ui.floating.FullScreenFloatyWindow;
 import org.autojs.autojs.ui.floating.layoutinspector.LayoutBoundsFloatyWindow;
 import org.autojs.autojs.ui.floating.layoutinspector.LayoutHierarchyFloatyWindow;
 import org.autojs.autojs.ui.log.LogActivity_;
-import org.autojs.autojs.ui.settings.SettingsActivity;
 import org.autojs.autojs.ui.settings.SettingsActivity_;
 
-import com.stardust.concurrent.VolatileBox;
 import com.stardust.view.accessibility.AccessibilityService;
 import com.stardust.view.accessibility.LayoutInspector;
 import com.stardust.view.accessibility.NodeInfo;
@@ -52,7 +48,10 @@ public class AutoJs extends com.stardust.autojs.AutoJs {
     }
 
 
-    public static void initInstance(Application application) {
+    public synchronized static void initInstance(Application application) {
+        if (instance != null) {
+            return;
+        }
         instance = new AutoJs(application);
     }
 
@@ -111,8 +110,8 @@ public class AutoJs extends com.stardust.autojs.AutoJs {
     }
 
     @Override
-    protected GlobalStardustConsole createGlobalConsole() {
-        return new GlobalStardustConsole(getUiHandler()) {
+    protected GlobalConsole createGlobalConsole() {
+        return new GlobalConsole(getUiHandler()) {
             @Override
             public String println(int level, CharSequence charSequence) {
                 String log = super.println(level, charSequence);
@@ -123,7 +122,7 @@ public class AutoJs extends com.stardust.autojs.AutoJs {
     }
 
     public void ensureAccessibilityServiceEnabled() {
-        if (AccessibilityService.getInstance() != null) {
+        if (AccessibilityService.Companion.getInstance() != null) {
             return;
         }
         String errorMessage = null;
@@ -146,7 +145,7 @@ public class AutoJs extends com.stardust.autojs.AutoJs {
 
     @Override
     public void waitForAccessibilityServiceEnabled() {
-        if (AccessibilityService.getInstance() != null) {
+        if (AccessibilityService.Companion.getInstance() != null) {
             return;
         }
         String errorMessage = null;
@@ -163,7 +162,7 @@ public class AutoJs extends com.stardust.autojs.AutoJs {
         }
         if (errorMessage != null) {
             AccessibilityServiceTool.goToAccessibilitySetting();
-            if (!org.autojs.autojs.accessibility.AccessibilityService.waitForEnabled(-1)) {
+            if (!AccessibilityService.Companion.waitForEnabled(-1)) {
                 throw new ScriptInterruptedException();
             }
         }
diff --git a/app/src/main/java/org/autojs/autojs/autojs/ScriptExecutionGlobalListener.java b/app/src/main/java/org/autojs/autojs/autojs/ScriptExecutionGlobalListener.java
index 90e58dfd..bdd62629 100644
--- a/app/src/main/java/org/autojs/autojs/autojs/ScriptExecutionGlobalListener.java
+++ b/app/src/main/java/org/autojs/autojs/autojs/ScriptExecutionGlobalListener.java
@@ -34,7 +34,7 @@ public class ScriptExecutionGlobalListener implements ScriptExecutionListener {
     }
 
     @Override
-    public void onException(ScriptExecution execution, Exception e) {
+    public void onException(ScriptExecution execution, Throwable e) {
         onFinish(execution);
     }
 
diff --git a/app/src/main/java/org/autojs/autojs/autojs/build/ApkBuilder.java b/app/src/main/java/org/autojs/autojs/autojs/build/ApkBuilder.java
new file mode 100644
index 00000000..6060878a
--- /dev/null
+++ b/app/src/main/java/org/autojs/autojs/autojs/build/ApkBuilder.java
@@ -0,0 +1,359 @@
+package org.autojs.autojs.autojs.build;
+
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+
+import com.stardust.app.GlobalAppContext;
+import com.stardust.autojs.apkbuilder.ApkPackager;
+import com.stardust.autojs.apkbuilder.ManifestEditor;
+import com.stardust.autojs.apkbuilder.util.StreamUtils;
+import com.stardust.autojs.project.BuildInfo;
+import com.stardust.autojs.project.ProjectConfig;
+import com.stardust.autojs.script.EncryptedScriptFileHeader;
+import com.stardust.autojs.script.JavaScriptFileSource;
+import com.stardust.pio.PFiles;
+import com.stardust.util.AdvancedEncryptionStandard;
+import com.stardust.util.MD5;
+
+import org.autojs.autojs.build.TinySign;
+
+import java.io.BufferedInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.concurrent.Callable;
+
+import pxb.android.StringItem;
+import pxb.android.axml.AxmlWriter;
+import zhao.arsceditor.ResDecoder.ARSCDecoder;
+import zhao.arsceditor.ResDecoder.data.ResTable;
+
+
+/**
+ * Created by Stardust on 2017/10/24.
+ */
+
+public class ApkBuilder {
+
+
+    public interface ProgressCallback {
+        void onPrepare(ApkBuilder builder);
+
+        void onBuild(ApkBuilder builder);
+
+        void onSign(ApkBuilder builder);
+
+        void onClean(ApkBuilder builder);
+
+    }
+
+    public static class AppConfig {
+        String appName;
+        String versionName;
+        int versionCode;
+        String sourcePath;
+        String packageName;
+        ArrayList<File> ignoredDirs = new ArrayList<>();
+        Callable<Bitmap> icon;
+
+        public static AppConfig fromProjectConfig(String projectDir, ProjectConfig projectConfig) {
+            String icon = projectConfig.getIcon();
+            AppConfig appConfig = new AppConfig()
+                    .setAppName(projectConfig.getName())
+                    .setPackageName(projectConfig.getPackageName())
+                    .ignoreDir(new File(projectDir, projectConfig.getBuildDir()))
+                    .setVersionCode(projectConfig.getVersionCode())
+                    .setVersionName(projectConfig.getVersionName())
+                    .setSourcePath(projectDir);
+            if (icon != null) {
+                appConfig.setIcon(new File(projectDir, icon).getPath());
+            }
+            return appConfig;
+        }
+
+
+        public AppConfig ignoreDir(File dir) {
+            ignoredDirs.add(dir);
+            return this;
+        }
+
+        public AppConfig setAppName(String appName) {
+            this.appName = appName;
+            return this;
+        }
+
+        public AppConfig setVersionName(String versionName) {
+            this.versionName = versionName;
+            return this;
+        }
+
+        public AppConfig setVersionCode(int versionCode) {
+            this.versionCode = versionCode;
+            return this;
+        }
+
+        public AppConfig setSourcePath(String sourcePath) {
+            this.sourcePath = sourcePath;
+            return this;
+        }
+
+        public AppConfig setPackageName(String packageName) {
+            this.packageName = packageName;
+            return this;
+        }
+
+
+        public AppConfig setIcon(Callable<Bitmap> icon) {
+            this.icon = icon;
+            return this;
+        }
+
+        public AppConfig setIcon(String iconPath) {
+            icon = () -> BitmapFactory.decodeFile(iconPath);
+            return this;
+        }
+
+        public String getAppName() {
+            return appName;
+        }
+
+        public String getVersionName() {
+            return versionName;
+        }
+
+        public int getVersionCode() {
+            return versionCode;
+        }
+
+        public String getSourcePath() {
+            return sourcePath;
+        }
+
+        public String getPackageName() {
+            return packageName;
+        }
+    }
+
+    private ProgressCallback mProgressCallback;
+    private ApkPackager mApkPackager;
+    private String mArscPackageName;
+    private ManifestEditor mManifestEditor;
+    private String mWorkspacePath;
+    private AppConfig mAppConfig;
+    private final File mOutApkFile;
+    private String mInitVector;
+    private String mKey;
+
+
+    public ApkBuilder(InputStream apkInputStream, File outApkFile, String workspacePath) {
+        mWorkspacePath = workspacePath;
+        mOutApkFile = outApkFile;
+        mApkPackager = new ApkPackager(apkInputStream, mWorkspacePath);
+        PFiles.ensureDir(outApkFile.getPath());
+    }
+
+    public ApkBuilder setProgressCallback(ProgressCallback callback) {
+        mProgressCallback = callback;
+        return this;
+    }
+
+    public ApkBuilder prepare() throws IOException {
+        if (mProgressCallback != null) {
+            GlobalAppContext.post(() -> mProgressCallback.onPrepare(ApkBuilder.this));
+        }
+        (new File(mWorkspacePath)).mkdirs();
+        mApkPackager.unzip();
+        return this;
+    }
+
+    public ApkBuilder setScriptFile(String path) throws IOException {
+        if (PFiles.isDir(path)) {
+            copyDir("assets/project/", path);
+        } else {
+            replaceFile("assets/project/main.js", path);
+        }
+        return this;
+    }
+
+    public void copyDir(String relativePath, String path) throws IOException {
+        File fromDir = new File(path);
+        File toDir = new File(mWorkspacePath, relativePath);
+        toDir.mkdir();
+        for (File child : fromDir.listFiles()) {
+            if (child.isFile()) {
+                if (child.getName().endsWith(".js")) {
+                    encrypt(toDir, child);
+                } else {
+                    StreamUtils.write(new FileInputStream(child),
+                            new FileOutputStream(new File(toDir, child.getName())));
+                }
+            } else {
+                if (!mAppConfig.ignoredDirs.contains(child)) {
+                    copyDir(PFiles.join(relativePath, child.getName() + "/"), child.getPath());
+                }
+            }
+        }
+    }
+
+    private void encrypt(File toDir, File file) throws IOException {
+        FileOutputStream fos = new FileOutputStream(new File(toDir, file.getName()));
+        EncryptedScriptFileHeader.INSTANCE.writeHeader(fos, (short) new JavaScriptFileSource(file).getExecutionMode());
+        encrypt(fos, file);
+    }
+
+    private void encrypt(FileOutputStream fos, File file) throws IOException {
+        try {
+            EncryptedScriptFileHeader.INSTANCE.writeHeader(fos, (short) new JavaScriptFileSource(file).getExecutionMode());
+            byte[] bytes = new AdvancedEncryptionStandard(mKey.getBytes(), mInitVector).encrypt(PFiles.readBytes(file.getPath()));
+            fos.write(bytes);
+            fos.close();
+        } catch (Exception e) {
+            throw new IOException(e);
+        }
+    }
+
+
+    public ApkBuilder replaceFile(String relativePath, String newFilePath) throws IOException {
+        if (newFilePath.endsWith(".js")) {
+            encrypt(new FileOutputStream(new File(mWorkspacePath, relativePath)), new File(newFilePath));
+        } else {
+            StreamUtils.write(new FileInputStream(newFilePath), new FileOutputStream(new File(mWorkspacePath, relativePath)));
+        }
+        return this;
+    }
+
+    public ApkBuilder withConfig(AppConfig config) throws IOException {
+        mAppConfig = config;
+        mManifestEditor = editManifest()
+                .setAppName(config.appName)
+                .setVersionName(config.versionName)
+                .setVersionCode(config.versionCode)
+                .setPackageName(config.packageName);
+        setArscPackageName(config.packageName);
+        updateProjectConfig(config);
+        setScriptFile(config.sourcePath);
+        return this;
+    }
+
+    public ManifestEditor editManifest() throws FileNotFoundException {
+        mManifestEditor = new ManifestEditorWithAuthorities(new FileInputStream(getManifestFile()));
+        return mManifestEditor;
+    }
+
+    protected File getManifestFile() {
+        return new File(mWorkspacePath, "AndroidManifest.xml");
+    }
+
+    private void updateProjectConfig(AppConfig appConfig) {
+        ProjectConfig config;
+        if (!PFiles.isDir(appConfig.sourcePath)) {
+            config = new ProjectConfig()
+                    .setMainScriptFile("main.js")
+                    .setName(appConfig.appName)
+                    .setPackageName(appConfig.packageName)
+                    .setVersionName(appConfig.versionName)
+                    .setVersionCode(appConfig.versionCode);
+            config.setBuildInfo(BuildInfo.generate(appConfig.versionCode));
+            PFiles.write(new File(mWorkspacePath, "assets/project/project.json").getPath(), config.toJson());
+        } else {
+            config = ProjectConfig.fromProjectDir(appConfig.sourcePath);
+            long buildNumber = config.getBuildInfo().getBuildNumber();
+            config.setBuildInfo(BuildInfo.generate(buildNumber + 1));
+            PFiles.write(ProjectConfig.configFileOfDir(appConfig.sourcePath), config.toJson());
+        }
+        mKey = MD5.md5(config.getPackageName() + config.getVersionName() + config.getMainScriptFile());
+        mInitVector = MD5.md5(config.getBuildInfo().getBuildId() + config.getName()).substring(0, 16);
+    }
+
+    public ApkBuilder build() throws IOException {
+        if (mProgressCallback != null) {
+            GlobalAppContext.post(() -> mProgressCallback.onBuild(ApkBuilder.this));
+        }
+        mManifestEditor.commit();
+        if (mAppConfig.icon != null) {
+            try {
+                Bitmap bitmap = mAppConfig.icon.call();
+                if (bitmap != null) {
+                    bitmap.compress(Bitmap.CompressFormat.PNG, 100,
+                            new FileOutputStream(new File(mWorkspacePath, "res/mipmap/ic_launcher.png")));
+                }
+            } catch (Exception e) {
+                throw new RuntimeException(e);
+            }
+        }
+        if (mManifestEditor != null) {
+            mManifestEditor.writeTo(new FileOutputStream(getManifestFile()));
+        }
+        if (mArscPackageName != null) {
+            buildArsc();
+        }
+        return this;
+    }
+
+    public ApkBuilder sign() throws Exception {
+        if (mProgressCallback != null) {
+            GlobalAppContext.post(() -> mProgressCallback.onSign(ApkBuilder.this));
+        }
+        FileOutputStream fos = new FileOutputStream(mOutApkFile);
+        TinySign.sign(new File(mWorkspacePath), fos);
+        fos.close();
+        return this;
+    }
+
+    public ApkBuilder cleanWorkspace() {
+        if (mProgressCallback != null) {
+            GlobalAppContext.post(() -> mProgressCallback.onClean(ApkBuilder.this));
+        }
+        delete(new File(mWorkspacePath));
+        return this;
+    }
+
+    public ApkBuilder setArscPackageName(String packageName) throws IOException {
+        mArscPackageName = packageName;
+        return this;
+    }
+
+    private void buildArsc() throws IOException {
+        File oldArsc = new File(mWorkspacePath, "resources.arsc");
+        File newArsc = new File(mWorkspacePath, "resources.arsc.new");
+        ARSCDecoder decoder = new ARSCDecoder(new BufferedInputStream(new FileInputStream(oldArsc)), (ResTable) null, false);
+        FileOutputStream fos = new FileOutputStream(newArsc);
+        decoder.CloneArsc(fos, mArscPackageName, true);
+        oldArsc.delete();
+        newArsc.renameTo(oldArsc);
+    }
+
+    private void delete(File file) {
+        if (file.isFile()) {
+            file.delete();
+        } else {
+            File[] files = file.listFiles();
+
+            for (File child : files) {
+                delete(child);
+            }
+            file.delete();
+        }
+    }
+
+    private class ManifestEditorWithAuthorities extends ManifestEditor {
+
+        ManifestEditorWithAuthorities(InputStream manifestInputStream) {
+            super(manifestInputStream);
+        }
+
+        @Override
+        public void onAttr(AxmlWriter.Attr attr) {
+            if ("authorities".equals(attr.name.data) && attr.value instanceof StringItem) {
+                ((StringItem) attr.value).data = mAppConfig.packageName + ".fileprovider";
+            } else {
+                super.onAttr(attr);
+            }
+
+        }
+    }
+}
diff --git a/app/src/main/java/org/autojs/autojs/autojs/build/AutoJsApkBuilder.java b/app/src/main/java/org/autojs/autojs/autojs/build/AutoJsApkBuilder.java
deleted file mode 100644
index 174e609d..00000000
--- a/app/src/main/java/org/autojs/autojs/autojs/build/AutoJsApkBuilder.java
+++ /dev/null
@@ -1,263 +0,0 @@
-package org.autojs.autojs.autojs.build;
-
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-
-import com.stardust.app.GlobalAppContext;
-import com.stardust.autojs.apkbuilder.ApkBuilder;
-import com.stardust.autojs.apkbuilder.ManifestEditor;
-import com.stardust.autojs.apkbuilder.util.StreamUtils;
-import com.stardust.autojs.project.BuildInfo;
-import com.stardust.autojs.project.ProjectConfig;
-import com.stardust.pio.PFiles;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.concurrent.Callable;
-
-/**
- * Created by Stardust on 2017/10/24.
- */
-
-public class AutoJsApkBuilder extends ApkBuilder {
-
-
-    public interface ProgressCallback {
-        void onPrepare(AutoJsApkBuilder builder);
-
-        void onBuild(AutoJsApkBuilder builder);
-
-        void onSign(AutoJsApkBuilder builder);
-
-        void onClean(AutoJsApkBuilder builder);
-
-    }
-
-    public static class AppConfig {
-        String appName;
-        String versionName;
-        int versionCode;
-        String sourcePath;
-        String packageName;
-        ArrayList<File> ignoredDirs = new ArrayList<>();
-        Callable<Bitmap> icon;
-
-        public static AppConfig fromProjectConfig(String projectDir, ProjectConfig projectConfig) {
-            String icon = projectConfig.getIcon();
-            AppConfig appConfig = new AppConfig()
-                    .setAppName(projectConfig.getName())
-                    .setPackageName(projectConfig.getPackageName())
-                    .ignoreDir(new File(projectDir, projectConfig.getBuildDir()))
-                    .setVersionCode(projectConfig.getVersionCode())
-                    .setVersionName(projectConfig.getVersionName())
-                    .setSourcePath(projectDir);
-            if (icon != null) {
-                appConfig.setIcon(new File(projectDir, icon).getPath());
-            }
-            return appConfig;
-        }
-
-
-        public AppConfig ignoreDir(File dir) {
-            ignoredDirs.add(dir);
-            return this;
-        }
-
-        public AppConfig setAppName(String appName) {
-            this.appName = appName;
-            return this;
-        }
-
-        public AppConfig setVersionName(String versionName) {
-            this.versionName = versionName;
-            return this;
-        }
-
-        public AppConfig setVersionCode(int versionCode) {
-            this.versionCode = versionCode;
-            return this;
-        }
-
-        public AppConfig setSourcePath(String sourcePath) {
-            this.sourcePath = sourcePath;
-            return this;
-        }
-
-        public AppConfig setPackageName(String packageName) {
-            this.packageName = packageName;
-            return this;
-        }
-
-
-        public AppConfig setIcon(Callable<Bitmap> icon) {
-            this.icon = icon;
-            return this;
-        }
-
-        public AppConfig setIcon(String iconPath) {
-            this.icon = () -> BitmapFactory.decodeFile(iconPath);
-            return this;
-        }
-
-        public String getAppName() {
-            return appName;
-        }
-
-        public String getVersionName() {
-            return versionName;
-        }
-
-        public int getVersionCode() {
-            return versionCode;
-        }
-
-        public String getSourcePath() {
-            return sourcePath;
-        }
-
-        public String getPackageName() {
-            return packageName;
-        }
-    }
-
-    private ProgressCallback mProgressCallback;
-    private ManifestEditor mManifestEditor;
-    private String mWorkspacePath;
-    private AppConfig mAppConfig;
-
-    public AutoJsApkBuilder(InputStream apkInputStream, File outApkFile, String workspacePath) {
-        super(apkInputStream, outApkFile, workspacePath);
-        mWorkspacePath = workspacePath;
-        PFiles.ensureDir(outApkFile.getPath());
-    }
-
-    public AutoJsApkBuilder(File inFile, File outFile, String workspacePath) throws FileNotFoundException {
-        super(inFile, outFile, workspacePath);
-        mWorkspacePath = workspacePath;
-    }
-
-    public AutoJsApkBuilder setProgressCallback(ProgressCallback callback) {
-        mProgressCallback = callback;
-        return this;
-    }
-
-    @Override
-    public AutoJsApkBuilder prepare() throws IOException {
-        if (mProgressCallback != null) {
-            GlobalAppContext.post(() -> mProgressCallback.onPrepare(AutoJsApkBuilder.this));
-        }
-        return (AutoJsApkBuilder) super.prepare();
-    }
-
-    public AutoJsApkBuilder setScriptFile(String path) throws IOException {
-        if (PFiles.isDir(path)) {
-            copyDir("assets/project/", path);
-        } else {
-            replaceFile("assets/project/main.js", path);
-        }
-        return this;
-    }
-
-    public void copyDir(String relativePath, String path) throws IOException {
-        File fromDir = new File(path);
-        File toDir = new File(this.mWorkspacePath, relativePath);
-        toDir.mkdir();
-        for (File child : fromDir.listFiles()) {
-            if (child.isFile()) {
-                StreamUtils.write(new FileInputStream(child),
-                        new FileOutputStream(new File(toDir, child.getName())));
-            } else {
-                if (!mAppConfig.ignoredDirs.contains(child)) {
-                    copyDir(PFiles.join(relativePath, child.getName() + "/"), child.getPath());
-                }
-            }
-        }
-    }
-
-    @Override
-    public ApkBuilder replaceFile(String relativePath, String newFilePath) throws IOException {
-        StreamUtils.write(new FileInputStream(newFilePath), new FileOutputStream(new File(this.mWorkspacePath, relativePath)));
-        return this;
-    }
-
-    public AutoJsApkBuilder withConfig(AppConfig config) throws IOException {
-        mAppConfig = config;
-        mManifestEditor = editManifest()
-                .setAppName(config.appName)
-                .setVersionName(config.versionName)
-                .setVersionCode(config.versionCode)
-                .setPackageName(config.packageName);
-        setArscPackageName(config.packageName);
-        updateProjectConfig(config);
-        setScriptFile(config.sourcePath);
-        return this;
-    }
-
-    private void updateProjectConfig(AppConfig config) {
-        if (!PFiles.isDir(config.sourcePath)) {
-            return;
-        }
-        ProjectConfig projectConfig = ProjectConfig.fromProjectDir(config.sourcePath);
-        long buildNumber = projectConfig.getBuildInfo().getBuildNumber();
-        projectConfig.setBuildInfo(BuildInfo.generate(buildNumber + 1));
-        //updateProjectConfigAssets(projectConfig, config.sourcePath, config.sourcePath);
-        PFiles.write(ProjectConfig.configFileOfDir(config.sourcePath), projectConfig.toJson());
-    }
-
-    private void updateProjectConfigAssets(ProjectConfig config, String projectDir, String dir) {
-        File main = new File(projectDir, config.getMainScriptFile());
-        for (File file : new File(dir).listFiles()) {
-            if (file.isDirectory()) {
-                updateProjectConfigAssets(config, projectDir, file.getPath());
-                continue;
-            }
-            if (file.equals(main)) {
-                continue;
-            }
-            String relative = new File(projectDir).toURI().relativize(file.toURI()).getPath();
-            config.addAsset(relative);
-        }
-    }
-
-    @Override
-    public AutoJsApkBuilder build() throws IOException {
-        if (mProgressCallback != null) {
-            GlobalAppContext.post(() -> mProgressCallback.onBuild(AutoJsApkBuilder.this));
-        }
-        mManifestEditor.commit();
-        if (mAppConfig.icon != null) {
-            try {
-                Bitmap bitmap = mAppConfig.icon.call();
-                if (bitmap != null) {
-                    bitmap.compress(Bitmap.CompressFormat.PNG, 100,
-                            new FileOutputStream(new File(mWorkspacePath, "res/mipmap/ic_launcher.png")));
-                }
-            } catch (Exception e) {
-                throw new RuntimeException(e);
-            }
-        }
-        return (AutoJsApkBuilder) super.build();
-    }
-
-    @Override
-    public AutoJsApkBuilder sign() throws Exception {
-        if (mProgressCallback != null) {
-            GlobalAppContext.post(() -> mProgressCallback.onSign(AutoJsApkBuilder.this));
-        }
-
-        return (AutoJsApkBuilder) super.sign();
-    }
-
-    @Override
-    public AutoJsApkBuilder cleanWorkspace() {
-        if (mProgressCallback != null) {
-            GlobalAppContext.post(() -> mProgressCallback.onClean(AutoJsApkBuilder.this));
-        }
-        return (AutoJsApkBuilder) super.cleanWorkspace();
-    }
-}
diff --git a/app/src/main/java/org/autojs/autojs/autojs/key/GlobalKeyObserver.java b/app/src/main/java/org/autojs/autojs/autojs/key/GlobalKeyObserver.java
index 29db0e58..61bf6168 100644
--- a/app/src/main/java/org/autojs/autojs/autojs/key/GlobalKeyObserver.java
+++ b/app/src/main/java/org/autojs/autojs/autojs/key/GlobalKeyObserver.java
@@ -34,7 +34,7 @@ public class GlobalKeyObserver implements OnKeyListener, ShellKeyObserver.KeyLis
     private boolean mVolumeUpFromShell, mVolumeUpFromAccessibility;
 
     GlobalKeyObserver() {
-        AccessibilityService.getStickOnKeyObserver()
+        AccessibilityService.Companion.getStickOnKeyObserver()
                 .addListener(this);
         ShellKeyObserver observer = new ShellKeyObserver();
         observer.setKeyListener(this);
diff --git a/app/src/main/java/org/autojs/autojs/build/ApkBuilderPluginHelper.java b/app/src/main/java/org/autojs/autojs/build/ApkBuilderPluginHelper.java
index ea11a20b..dc302e5c 100644
--- a/app/src/main/java/org/autojs/autojs/build/ApkBuilderPluginHelper.java
+++ b/app/src/main/java/org/autojs/autojs/build/ApkBuilderPluginHelper.java
@@ -5,6 +5,7 @@ import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 
 import com.stardust.pio.UncheckedIOException;
+
 import org.autojs.autojs.BuildConfig;
 
 import com.stardust.util.DeveloperUtils;
@@ -20,6 +21,7 @@ public class ApkBuilderPluginHelper {
 
     private static final String PLUGIN_PACKAGE_NAME = "org.autojs.apkbuilderplugin";
     private static final String TEMPLATE_APK_PATH = "template.apk";
+    private static final boolean DEBUG_APK_PLUGIN = false;
 
     public static boolean isPluginAvailable(Context context) {
         return DeveloperUtils.checkSignature(context, PLUGIN_PACKAGE_NAME);
@@ -27,9 +29,9 @@ public class ApkBuilderPluginHelper {
 
     public static InputStream openTemplateApk(Context context) {
         try {
-            //if (BuildConfig.DEBUG) {
-            //  return context.getAssets().open(TEMPLATE_APK_PATH);
-            //}
+            if (DEBUG_APK_PLUGIN && BuildConfig.DEBUG) {
+                return context.getAssets().open(TEMPLATE_APK_PATH);
+            }
             return context.getPackageManager().getResourcesForApplication(PLUGIN_PACKAGE_NAME)
                     .getAssets().open(TEMPLATE_APK_PATH);
         } catch (IOException e) {
diff --git a/app/src/main/java/org/autojs/autojs/build/TinySign.java b/app/src/main/java/org/autojs/autojs/build/TinySign.java
new file mode 100644
index 00000000..4634dbc3
--- /dev/null
+++ b/app/src/main/java/org/autojs/autojs/build/TinySign.java
@@ -0,0 +1,218 @@
+package org.autojs.autojs.build;
+
+import android.util.Base64;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FilterOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.PrintStream;
+import java.io.UnsupportedEncodingException;
+import java.security.DigestOutputStream;
+import java.security.KeyFactory;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.security.PrivateKey;
+import java.security.Signature;
+import java.security.SignatureException;
+import java.security.spec.PKCS8EncodedKeySpec;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.jar.Attributes;
+import java.util.jar.Manifest;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.IOUtils;
+
+public class TinySign {
+    public TinySign() {
+    }
+
+    private static byte[] dBase64(String data) throws UnsupportedEncodingException {
+        return Base64.decode(data.getBytes("UTF-8"), Base64.NO_WRAP);
+    }
+
+    private static void doDir(String prefix, File dir, ZipOutputStream zos, DigestOutputStream dos, Manifest m) throws IOException {
+        zos.putNextEntry(new ZipEntry(prefix));
+        zos.closeEntry();
+        File[] arr$ = dir.listFiles();
+        int len$ = arr$.length;
+
+        for(int i$ = 0; i$ < len$; ++i$) {
+            File f = arr$[i$];
+            if (f.isFile()) {
+                doFile(prefix + f.getName(), f, zos, dos, m);
+            } else {
+                doDir(prefix + f.getName() + "/", f, zos, dos, m);
+            }
+        }
+
+    }
+
+    private static void doFile(String name, File f, ZipOutputStream zos, DigestOutputStream dos, Manifest m) throws IOException {
+        zos.putNextEntry(new ZipEntry(name));
+        FileInputStream fis = FileUtils.openInputStream(f);
+        IOUtils.copy(fis, dos);
+        IOUtils.closeQuietly(fis);
+        byte[] digets = dos.getMessageDigest().digest();
+        zos.closeEntry();
+        Attributes attr = new Attributes();
+        attr.putValue("SHA1-Digest", eBase64(digets));
+        m.getEntries().put(name, attr);
+    }
+
+    private static String eBase64(byte[] data) {
+        return Base64.encodeToString(data, Base64.NO_WRAP);
+    }
+
+    private static Manifest generateSF(Manifest manifest) throws NoSuchAlgorithmException, UnsupportedEncodingException {
+        MessageDigest md = MessageDigest.getInstance("SHA1");
+        PrintStream print = new PrintStream(new DigestOutputStream(new OutputStream() {
+            public void write(byte[] arg0) {
+            }
+
+            public void write(byte[] arg0, int arg1, int arg2) {
+            }
+
+            public void write(int arg0) {
+            }
+        }, md), true, "UTF-8");
+        Manifest sf = new Manifest();
+        Map<String, Attributes> entries = manifest.getEntries();
+        Iterator<Entry<String, Attributes>> iterator = entries.entrySet().iterator();
+
+        while(iterator.hasNext()) {
+            Entry<String, Attributes> entry = iterator.next();
+            print.print("Name: " + entry.getKey() + "\r\n");
+            Iterator<Entry<Object, Object>> iter = entry.getValue().entrySet().iterator();
+
+            while(iter.hasNext()) {
+                Entry<Object, Object> att = iter.next();
+                print.print(att.getKey() + ": " + att.getValue() + "\r\n");
+            }
+
+            print.print("\r\n");
+            print.flush();
+            Attributes sfAttr = new Attributes();
+            sfAttr.putValue("SHA1-Digest", eBase64(md.digest()));
+            sf.getEntries().put(entry.getKey(), sfAttr);
+        }
+
+        return sf;
+    }
+
+    private static Signature instanceSignature() throws Exception {
+        byte[] data = dBase64("MIIBVgIBADANBgkqhkiG9w0BAQEFAASCAUAwggE8AgEAAkEAoiZSqWnFDHA5sXKoDiUUO9JuL7cm/2dCck5MKumVvv+WfSg0jsovnywsFN0pifmdRSLmOdUkh0d0J+tOnSgtsQIDAQABAkEAihag5u3Qhds9BsViIUmqhZebhr8vUuqZR8cuTo1GnbSoOHIPbAgD3J8TDbC/CVqae8NrgwLp325Pem1Tuof/0QIhAN1hqft1K307bsljgw3iYKopGVZBHRXsjRnNL4edV9QrAiEAu4F+XtS1wohGLz5QtfuMFsQNo4l31mCjt6WpBDmSi5MCIQCB++YijxmJ3mueM5+vd0vqnVcTHghF5y6yB5fwuKHpIQIgInnS1Hjj2prX3MPmby+LOHxfzZvvDtnCAHhTNVWonkUCIQCvV8l+SpL6Vh1nQ/2EKFJo2dbZB3wKG/BEYsFkPFbn9w==");
+        KeyFactory rSAKeyFactory = KeyFactory.getInstance("RSA");
+        PrivateKey privateKey = rSAKeyFactory.generatePrivate(new PKCS8EncodedKeySpec(data));
+        Signature signature = Signature.getInstance("SHA1withRSA");
+        signature.initSign(privateKey);
+        return signature;
+    }
+
+    public static void sign(File dir, OutputStream out) throws Exception {
+        ZipOutputStream zos = new ZipOutputStream(out);
+        zos.putNextEntry(new ZipEntry("META-INF/"));
+        zos.closeEntry();
+        Manifest manifest = new Manifest();
+        String sha1Manifest = writeMF(dir, manifest, zos);
+        Manifest sf = generateSF(manifest);
+        byte[] sign = writeSF(zos, sf, sha1Manifest);
+        writeRSA(zos, sign);
+        IOUtils.closeQuietly(zos);
+    }
+
+    private static String writeMF(File dir, Manifest manifest, ZipOutputStream zos) throws NoSuchAlgorithmException, IOException {
+        MessageDigest md = MessageDigest.getInstance("SHA1");
+        DigestOutputStream dos = new DigestOutputStream(zos, md);
+        zipAndSha1(dir, zos, dos, manifest);
+        Attributes main = manifest.getMainAttributes();
+        main.putValue("Manifest-Version", "1.0");
+        main.putValue("Created-By", "tiny-sign-" + TinySign.class.getPackage().getImplementationVersion());
+        zos.putNextEntry(new ZipEntry("META-INF/MANIFEST.MF"));
+        manifest.write(dos);
+        zos.closeEntry();
+        return eBase64(md.digest());
+    }
+
+    private static void writeRSA(ZipOutputStream zos, byte[] sign) throws IOException {
+        zos.putNextEntry(new ZipEntry("META-INF/CERT.RSA"));
+        zos.write(dBase64("MIIB5gYJKoZIhvcNAQcCoIIB1zCCAdMCAQExCzAJBgUrDgMCGgUAMAsGCSqGSIb3DQEHAaCCATYwggEyMIHdoAMCAQICBCunMokwDQYJKoZIhvcNAQELBQAwDzENMAsGA1UEAxMEVGVzdDAeFw0xMjA0MjIwODQ1NDdaFw0xMzA0MjIwODQ1NDdaMA8xDTALBgNVBAMTBFRlc3QwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAoiZSqWnFDHA5sXKoDiUUO9JuL7cm/2dCck5MKumVvv+WfSg0jsovnywsFN0pifmdRSLmOdUkh0d0J+tOnSgtsQIDAQABoyEwHzAdBgNVHQ4EFgQUVL2yOinUwpARE1tOPxc1bf4WrTgwDQYJKoZIhvcNAQELBQADQQAnj/eZwhqwb2tgSYNvgRo5bBNNCpJbQ4alEeP/MLSIWf2nZpAix8T3oS9X2affQtAgctPATcKQaiH2B4L7FKlVMXoweAIBATAXMA8xDTALBgNVBAMTBFRlc3QCBCunMokwCQYFKw4DAhoFADANBgkqhkiG9w0BAQEFAARA"));
+        zos.write(sign);
+        zos.closeEntry();
+    }
+
+    private static byte[] writeSF(ZipOutputStream zos, Manifest sf, String sha1Manifest) throws Exception {
+        Signature signature = instanceSignature();
+        zos.putNextEntry(new ZipEntry("META-INF/CERT.SF"));
+        TinySign.SignatureOutputStream out = new TinySign.SignatureOutputStream(zos, signature);
+        out.write("Signature-Version: 1.0\r\n".getBytes("UTF-8"));
+        out.write(("Created-By: tiny-sign-" + TinySign.class.getPackage().getImplementationVersion() + "\r\n").getBytes("UTF-8"));
+        out.write("SHA1-Digest-Manifest: ".getBytes("UTF-8"));
+        out.write(sha1Manifest.getBytes("UTF-8"));
+        out.write(13);
+        out.write(10);
+        sf.write(out);
+        zos.closeEntry();
+        return signature.sign();
+    }
+
+    private static void zipAndSha1(File dir, ZipOutputStream zos, DigestOutputStream dos, Manifest m) throws NoSuchAlgorithmException, IOException {
+        File[] arr$ = dir.listFiles();
+        int len$ = arr$.length;
+
+        for(int i$ = 0; i$ < len$; ++i$) {
+            File f = arr$[i$];
+            if (!f.getName().startsWith("META-INF")) {
+                if (f.isFile()) {
+                    doFile(f.getName(), f, zos, dos, m);
+                } else {
+                    doDir(f.getName() + "/", f, zos, dos, m);
+                }
+            }
+        }
+
+    }
+
+    private static class SignatureOutputStream extends FilterOutputStream {
+        private Signature mSignature;
+
+        public SignatureOutputStream(OutputStream out, Signature sig) {
+            super(out);
+            this.mSignature = sig;
+        }
+
+        public void write(byte[] buffer) throws IOException {
+            try {
+                this.mSignature.update(buffer);
+            } catch (SignatureException var3) {
+                throw new IOException("SignatureException: " + var3);
+            }
+
+            this.out.write(buffer);
+        }
+
+        public void write(byte[] b, int off, int len) throws IOException {
+            try {
+                this.mSignature.update(b, off, len);
+            } catch (SignatureException var5) {
+                throw new IOException("SignatureException: " + var5);
+            }
+
+            this.out.write(b, off, len);
+        }
+
+        public void write(int b) throws IOException {
+            try {
+                this.mSignature.update((byte)b);
+            } catch (SignatureException var3) {
+                throw new IOException("SignatureException: " + var3);
+            }
+
+            this.out.write(b);
+        }
+    }
+}
diff --git a/app/src/main/java/org/autojs/autojs/external/ScriptExecutionIntentService.java b/app/src/main/java/org/autojs/autojs/external/ScriptExecutionIntentService.java
index db4fcef5..79b2695b 100644
--- a/app/src/main/java/org/autojs/autojs/external/ScriptExecutionIntentService.java
+++ b/app/src/main/java/org/autojs/autojs/external/ScriptExecutionIntentService.java
@@ -2,7 +2,7 @@ package org.autojs.autojs.external;
 
 import android.app.IntentService;
 import android.content.Intent;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 /**
  * Created by Stardust on 2017/5/15.
diff --git a/app/src/main/java/org/autojs/autojs/external/ScriptIntents.java b/app/src/main/java/org/autojs/autojs/external/ScriptIntents.java
index 3dd1a304..e216a68d 100644
--- a/app/src/main/java/org/autojs/autojs/external/ScriptIntents.java
+++ b/app/src/main/java/org/autojs/autojs/external/ScriptIntents.java
@@ -28,7 +28,6 @@ public class ScriptIntents {
     public static final String EXTRA_KEY_LOOP_INTERVAL = "interval";
     public static final String EXTRA_KEY_DELAY = "delay";
 
-
     public static boolean isTaskerBundleValid(Bundle bundle) {
         return bundle.containsKey(ScriptIntents.EXTRA_KEY_PATH) || bundle.containsKey(EXTRA_KEY_PRE_EXECUTE_SCRIPT);
     }
@@ -40,7 +39,10 @@ public class ScriptIntents {
         long delay = intent.getLongExtra(EXTRA_KEY_DELAY, 0);
         long interval = intent.getLongExtra(EXTRA_KEY_LOOP_INTERVAL, 0);
         ScriptSource source = null;
-        ExecutionConfig config = new ExecutionConfig().loop(delay, loopTimes, interval);
+        ExecutionConfig config = new ExecutionConfig();
+        config.setDelay(delay);
+        config.setLoopTimes(loopTimes);
+        config.setInterval(interval);
         config.setArgument("intent", intent);
         if (path == null && script != null) {
             source = new StringScriptSource(script);
@@ -51,9 +53,9 @@ public class ScriptIntents {
             } else {
                 source = fileScriptSource;
             }
-            config.executePath(new File(path).getParent());
+            config.setWorkingDirectory(new File(path).getParent());
         } else {
-            config.executePath(Pref.getScriptDirPath());
+            config.setWorkingDirectory(Pref.getScriptDirPath());
         }
         if (source == null) {
             return false;
diff --git a/app/src/main/java/org/autojs/autojs/external/fileprovider/AppFileProvider.java b/app/src/main/java/org/autojs/autojs/external/fileprovider/AppFileProvider.java
index a2c99237..41b314af 100644
--- a/app/src/main/java/org/autojs/autojs/external/fileprovider/AppFileProvider.java
+++ b/app/src/main/java/org/autojs/autojs/external/fileprovider/AppFileProvider.java
@@ -2,7 +2,7 @@ package org.autojs.autojs.external.fileprovider;
 
 import android.content.Context;
 import android.net.Uri;
-import android.support.v4.content.FileProvider;
+import androidx.core.content.FileProvider;
 
 import java.io.File;
 
diff --git a/app/src/main/java/org/autojs/autojs/external/foreground/ForegroundService.java b/app/src/main/java/org/autojs/autojs/external/foreground/ForegroundService.java
index a600f0a5..33f3bcba 100644
--- a/app/src/main/java/org/autojs/autojs/external/foreground/ForegroundService.java
+++ b/app/src/main/java/org/autojs/autojs/external/foreground/ForegroundService.java
@@ -9,16 +9,13 @@ import android.content.Context;
 import android.content.Intent;
 import android.os.Build;
 import android.os.IBinder;
-import android.support.annotation.Nullable;
-import android.support.annotation.RequiresApi;
-import android.support.v4.app.NotificationCompat;
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
+import androidx.core.app.NotificationCompat;
 
 import org.autojs.autojs.R;
 import org.autojs.autojs.ui.main.MainActivity_;
 
-import java.lang.reflect.Array;
-import java.util.Arrays;
-
 public class ForegroundService extends Service {
 
 
diff --git a/app/src/main/java/org/autojs/autojs/external/open/EditIntentActivity.java b/app/src/main/java/org/autojs/autojs/external/open/EditIntentActivity.java
index 3e2f9244..87c58cae 100644
--- a/app/src/main/java/org/autojs/autojs/external/open/EditIntentActivity.java
+++ b/app/src/main/java/org/autojs/autojs/external/open/EditIntentActivity.java
@@ -1,21 +1,30 @@
 package org.autojs.autojs.external.open;
 
+import android.content.ContentResolver;
 import android.content.Intent;
+import android.net.Uri;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
+import android.os.Environment;
+import androidx.annotation.Nullable;
 import android.text.TextUtils;
 import android.widget.Toast;
 
+import com.stardust.pio.PFiles;
+
 import org.autojs.autojs.ui.BaseActivity;
 import org.autojs.autojs.ui.edit.EditActivity;
 import org.autojs.autojs.R;
 
+import java.io.File;
+
 /**
  * Created by Stardust on 2017/2/2.
  */
 
 public class EditIntentActivity extends BaseActivity {
 
+    private static final String EXTERNAL_FILES = "external_files";
+
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -30,8 +39,26 @@ public class EditIntentActivity extends BaseActivity {
 
     private void handleIntent() {
         Intent intent = getIntent();
-        String path = intent.getData().getPath();
-        if (!TextUtils.isEmpty(path))
+        Uri uri = intent.getData();
+        String path = null;
+        if (uri.getScheme().equals(ContentResolver.SCHEME_FILE)) {
+            path = uri.getPath();
+        } else {
+            int i = uri.getPath().indexOf(EXTERNAL_FILES);
+            if (i >= 0) {
+                path = uri.getPath().substring(i + EXTERNAL_FILES.length());
+                if (!PFiles.exists(path)) {
+                    path = new File(Environment.getExternalStorageDirectory(), path).getPath();
+                    if (!PFiles.exists(path)) {
+                        path = null;
+                    }
+                }
+            }
+        }
+        if (!TextUtils.isEmpty(path)) {
             EditActivity.editFile(this, path);
+        } else {
+            EditActivity.editFile(this, uri);
+        }
     }
 }
diff --git a/app/src/main/java/org/autojs/autojs/external/open/ImportIntentActivity.java b/app/src/main/java/org/autojs/autojs/external/open/ImportIntentActivity.java
index 550f1140..d4f07af4 100644
--- a/app/src/main/java/org/autojs/autojs/external/open/ImportIntentActivity.java
+++ b/app/src/main/java/org/autojs/autojs/external/open/ImportIntentActivity.java
@@ -3,7 +3,7 @@ package org.autojs.autojs.external.open;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.text.TextUtils;
 import android.widget.Toast;
 
@@ -15,9 +15,6 @@ import org.autojs.autojs.R;
 import java.io.FileNotFoundException;
 import java.io.InputStream;
 
-import io.reactivex.annotations.NonNull;
-import io.reactivex.functions.Consumer;
-
 /**
  * Created by Stardust on 2017/2/2.
  */
diff --git a/app/src/main/java/org/autojs/autojs/external/open/RunIntentActivity.java b/app/src/main/java/org/autojs/autojs/external/open/RunIntentActivity.java
index d5f645f8..6610da0f 100644
--- a/app/src/main/java/org/autojs/autojs/external/open/RunIntentActivity.java
+++ b/app/src/main/java/org/autojs/autojs/external/open/RunIntentActivity.java
@@ -4,7 +4,7 @@ import android.app.Activity;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.widget.Toast;
 
 import com.stardust.autojs.script.StringScriptSource;
@@ -38,7 +38,7 @@ public class RunIntentActivity extends Activity {
         Uri uri = intent.getData();
         if (uri != null && "content".equals(uri.getScheme())) {
             InputStream stream = getContentResolver().openInputStream(uri);
-            Scripts.run(new StringScriptSource(PFiles.read(stream)));
+            Scripts.INSTANCE.run(new StringScriptSource(PFiles.read(stream)));
         } else {
             ScriptIntents.handleIntent(this, intent);
         }
diff --git a/app/src/main/java/org/autojs/autojs/external/receiver/BaseBroadcastReceiver.java b/app/src/main/java/org/autojs/autojs/external/receiver/BaseBroadcastReceiver.java
index 791fcbb4..0d9dab6d 100644
--- a/app/src/main/java/org/autojs/autojs/external/receiver/BaseBroadcastReceiver.java
+++ b/app/src/main/java/org/autojs/autojs/external/receiver/BaseBroadcastReceiver.java
@@ -40,7 +40,7 @@ public class BaseBroadcastReceiver extends BroadcastReceiver {
         ScriptFile file = new ScriptFile(task.getScriptPath());
         ExecutionConfig config = new ExecutionConfig();
         config.setArgument("intent", intent.clone());
-        config.executePath(file.getParent());
+        config.setWorkingDirectory(file.getParent());
         try {
             AutoJs.getInstance().getScriptEngineService().execute(file.toSource(), config);
         } catch (Exception e) {
diff --git a/app/src/main/java/org/autojs/autojs/external/receiver/DynamicBroadcastReceivers.java b/app/src/main/java/org/autojs/autojs/external/receiver/DynamicBroadcastReceivers.java
index faf0388c..c5502611 100644
--- a/app/src/main/java/org/autojs/autojs/external/receiver/DynamicBroadcastReceivers.java
+++ b/app/src/main/java/org/autojs/autojs/external/receiver/DynamicBroadcastReceivers.java
@@ -4,12 +4,12 @@ import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.IntentFilter;
 import android.os.Build;
-import android.support.design.widget.TabLayout;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 import android.util.Log;
-import android.util.Pair;
+
+import org.autojs.autojs.timing.IntentTask;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Iterator;
@@ -17,15 +17,10 @@ import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
 
-import static android.content.Intent.ACTION_BATTERY_CHANGED;
-import static android.content.Intent.ACTION_CONFIGURATION_CHANGED;
-import static android.content.Intent.ACTION_PACKAGES_SUSPENDED;
-import static android.content.Intent.ACTION_PACKAGES_UNSUSPENDED;
-import static android.content.Intent.ACTION_SCREEN_OFF;
-import static android.content.Intent.ACTION_SCREEN_ON;
-
 public class DynamicBroadcastReceivers {
 
+    public static final String ACTION_STARTUP = "org.autojs.autojs.action.startup";
+
     private static final String LOG_TAG = "DynBroadcastReceivers";
 
     private final Set<String> mActions = new LinkedHashSet<>();
@@ -43,15 +38,13 @@ public class DynamicBroadcastReceivers {
             filter.addDataScheme("package");
             mContext.registerReceiver(mPackageActionReceiver, filter);
         }
-
-
     }
 
-    public void register(String action) {
-        register(Collections.singletonList(action));
+    public void register(IntentTask task) {
+        register(Collections.singletonList(task.getAction()), task.isLocal());
     }
 
-    public synchronized void register(List<String> actions) {
+    public synchronized void register(List<String> actions, boolean local) {
         LinkedHashSet<String> newActions = new LinkedHashSet<>();
         for (String action : actions) {
             if (!StaticBroadcastReceiver.ACTIONS.contains(action)
@@ -63,7 +56,7 @@ public class DynamicBroadcastReceivers {
         if (newActions.isEmpty()) {
             return;
         }
-        ReceiverRegistry receiverRegistry = new ReceiverRegistry(newActions);
+        ReceiverRegistry receiverRegistry = new ReceiverRegistry(newActions, local);
         receiverRegistry.register();
         mReceiverRegistries.add(receiverRegistry);
     }
@@ -110,21 +103,33 @@ public class DynamicBroadcastReceivers {
     private class ReceiverRegistry {
         BroadcastReceiver receiver;
         LinkedHashSet<String> actions;
+        boolean local;
 
-        ReceiverRegistry(LinkedHashSet<String> actions) {
+        ReceiverRegistry(LinkedHashSet<String> actions, boolean local) {
             this.actions = actions;
+            this.local = local;
             receiver = new BaseBroadcastReceiver();
         }
 
         void unregister() {
-            mContext.unregisterReceiver(receiver);
+            if (local) {
+                LocalBroadcastManager broadcastManager = LocalBroadcastManager.getInstance(mContext);
+                broadcastManager.unregisterReceiver(receiver);
+            } else {
+                mContext.unregisterReceiver(receiver);
+            }
         }
 
         boolean register() {
             if (actions.isEmpty())
                 return false;
             IntentFilter intentFilter = createIntentFilter(actions);
-            mContext.registerReceiver(receiver, intentFilter);
+            if (local) {
+                LocalBroadcastManager broadcastManager = LocalBroadcastManager.getInstance(mContext);
+                broadcastManager.registerReceiver(receiver, intentFilter);
+            } else {
+                mContext.registerReceiver(receiver, intentFilter);
+            }
             Log.d(LOG_TAG, "register: " + actions);
             return true;
         }
diff --git a/app/src/main/java/org/autojs/autojs/external/shortcut/ShortcutActivity.java b/app/src/main/java/org/autojs/autojs/external/shortcut/ShortcutActivity.java
index 005a601d..dc0a7f29 100644
--- a/app/src/main/java/org/autojs/autojs/external/shortcut/ShortcutActivity.java
+++ b/app/src/main/java/org/autojs/autojs/external/shortcut/ShortcutActivity.java
@@ -26,7 +26,7 @@ public class ShortcutActivity extends Activity {
 
     private void runScriptFile(String path) {
         try {
-            Scripts.run(new ScriptFile(path));
+            Scripts.INSTANCE.run(new ScriptFile(path));
         } catch (Exception e) {
             e.printStackTrace();
             Toast.makeText(this, e.getMessage(), Toast.LENGTH_SHORT).show();
diff --git a/app/src/main/java/org/autojs/autojs/external/shortcut/ShortcutManager.java b/app/src/main/java/org/autojs/autojs/external/shortcut/ShortcutManager.java
index 0e7adc79..a0d6d1d9 100644
--- a/app/src/main/java/org/autojs/autojs/external/shortcut/ShortcutManager.java
+++ b/app/src/main/java/org/autojs/autojs/external/shortcut/ShortcutManager.java
@@ -1,23 +1,17 @@
 package org.autojs.autojs.external.shortcut;
 
 import android.app.PendingIntent;
-import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
-import android.content.IntentFilter;
 import android.content.pm.ShortcutInfo;
 import android.graphics.drawable.Icon;
 import android.os.Build;
-import android.support.annotation.Nullable;
-import android.support.annotation.RequiresApi;
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
 
 import java.util.Collections;
 import java.util.List;
 
-import io.reactivex.Observable;
-import io.reactivex.subjects.PublishSubject;
-import io.reactivex.subjects.Subject;
-
 /**
  * Created by Stardust on 2017/10/25.
  */
diff --git a/app/src/main/java/org/autojs/autojs/external/tasker/FireSettingReceiver.java b/app/src/main/java/org/autojs/autojs/external/tasker/FireSettingReceiver.java
index 51377e2b..8b4faea1 100644
--- a/app/src/main/java/org/autojs/autojs/external/tasker/FireSettingReceiver.java
+++ b/app/src/main/java/org/autojs/autojs/external/tasker/FireSettingReceiver.java
@@ -3,7 +3,7 @@ package org.autojs.autojs.external.tasker;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.autojs.autojs.external.ScriptIntents;
 import org.autojs.autojs.external.open.RunIntentActivity;
diff --git a/app/src/main/java/org/autojs/autojs/external/tasker/TaskPrefEditActivity.java b/app/src/main/java/org/autojs/autojs/external/tasker/TaskPrefEditActivity.java
index 80426dc6..e9041dd8 100644
--- a/app/src/main/java/org/autojs/autojs/external/tasker/TaskPrefEditActivity.java
+++ b/app/src/main/java/org/autojs/autojs/external/tasker/TaskPrefEditActivity.java
@@ -3,8 +3,8 @@ package org.autojs.autojs.external.tasker;
 import android.content.Intent;
 import android.os.Bundle;
 import android.os.Environment;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.text.TextUtils;
 import android.view.Menu;
 import android.view.MenuItem;
diff --git a/app/src/main/java/org/autojs/autojs/external/tile/LayoutBoundsTile.java b/app/src/main/java/org/autojs/autojs/external/tile/LayoutBoundsTile.java
index 883e4984..fa0b3f0b 100644
--- a/app/src/main/java/org/autojs/autojs/external/tile/LayoutBoundsTile.java
+++ b/app/src/main/java/org/autojs/autojs/external/tile/LayoutBoundsTile.java
@@ -1,7 +1,7 @@
 package org.autojs.autojs.external.tile;
 
 import android.os.Build;
-import android.support.annotation.RequiresApi;
+import androidx.annotation.RequiresApi;
 
 import com.stardust.view.accessibility.NodeInfo;
 
diff --git a/app/src/main/java/org/autojs/autojs/external/tile/LayoutHierarchyTile.java b/app/src/main/java/org/autojs/autojs/external/tile/LayoutHierarchyTile.java
index ea9db9d2..8efc553b 100644
--- a/app/src/main/java/org/autojs/autojs/external/tile/LayoutHierarchyTile.java
+++ b/app/src/main/java/org/autojs/autojs/external/tile/LayoutHierarchyTile.java
@@ -1,7 +1,7 @@
 package org.autojs.autojs.external.tile;
 
 import android.os.Build;
-import android.support.annotation.RequiresApi;
+import androidx.annotation.RequiresApi;
 
 import com.stardust.view.accessibility.NodeInfo;
 
diff --git a/app/src/main/java/org/autojs/autojs/external/tile/LayoutInspectTileService.java b/app/src/main/java/org/autojs/autojs/external/tile/LayoutInspectTileService.java
index 962931f9..26aa5768 100644
--- a/app/src/main/java/org/autojs/autojs/external/tile/LayoutInspectTileService.java
+++ b/app/src/main/java/org/autojs/autojs/external/tile/LayoutInspectTileService.java
@@ -4,16 +4,16 @@ import android.content.Intent;
 import android.os.Build;
 import android.service.quicksettings.Tile;
 import android.service.quicksettings.TileService;
-import android.support.annotation.RequiresApi;
+import androidx.annotation.RequiresApi;
 import android.util.Log;
 import android.widget.Toast;
 
 import com.stardust.app.GlobalAppContext;
+import com.stardust.view.accessibility.AccessibilityService;
 import com.stardust.view.accessibility.LayoutInspector;
 import com.stardust.view.accessibility.NodeInfo;
 
 import org.autojs.autojs.R;
-import org.autojs.autojs.accessibility.AccessibilityService;
 import org.autojs.autojs.autojs.AutoJs;
 import org.autojs.autojs.tool.AccessibilityServiceTool;
 import org.autojs.autojs.ui.floating.FloatyWindowManger;
@@ -50,7 +50,7 @@ public abstract class LayoutInspectTileService extends TileService implements La
         super.onClick();
         Log.d(getClass().getName(), "onClick");
         sendBroadcast(new Intent(Intent.ACTION_CLOSE_SYSTEM_DIALOGS));
-        if (AccessibilityService.getInstance() == null) {
+        if (AccessibilityService.Companion.getInstance() == null) {
             Toast.makeText(this, R.string.text_no_accessibility_permission_to_capture, Toast.LENGTH_SHORT).show();
             AccessibilityServiceTool.goToAccessibilitySetting();
             inactive();
diff --git a/app/src/main/java/org/autojs/autojs/external/widget/ScriptWidgetSettingsActivity.java b/app/src/main/java/org/autojs/autojs/external/widget/ScriptWidgetSettingsActivity.java
index bd6276cb..8c18bee7 100644
--- a/app/src/main/java/org/autojs/autojs/external/widget/ScriptWidgetSettingsActivity.java
+++ b/app/src/main/java/org/autojs/autojs/external/widget/ScriptWidgetSettingsActivity.java
@@ -4,7 +4,7 @@ import android.appwidget.AppWidgetManager;
 import android.content.Intent;
 import android.os.Bundle;
 import android.os.Environment;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.view.Menu;
 import android.view.MenuItem;
 
@@ -42,8 +42,8 @@ public class ScriptWidgetSettingsActivity extends BaseActivity {
 
 
     private void initScriptListRecyclerView() {
-        mExplorer = new Explorer(new ExplorerFileProvider(Scripts.FILE_FILTER), 0);
-        ExplorerView explorerView = (ExplorerView) findViewById(R.id.script_list);
+        mExplorer = new Explorer(new ExplorerFileProvider(Scripts.INSTANCE.getFILE_FILTER()), 0);
+        ExplorerView explorerView = findViewById(R.id.script_list);
         explorerView.setExplorer(mExplorer, ExplorerDirPage.createRoot(Environment.getExternalStorageDirectory()));
         explorerView.setOnItemClickListener((view, file) -> {
             mSelectedScriptFilePath = file.getPath();
diff --git a/app/src/main/java/org/autojs/autojs/model/autocomplete/DictionaryTree.java b/app/src/main/java/org/autojs/autojs/model/autocomplete/DictionaryTree.java
index ce7accdb..a2dea94d 100644
--- a/app/src/main/java/org/autojs/autojs/model/autocomplete/DictionaryTree.java
+++ b/app/src/main/java/org/autojs/autojs/model/autocomplete/DictionaryTree.java
@@ -1,10 +1,9 @@
 package org.autojs.autojs.model.autocomplete;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
diff --git a/app/src/main/java/org/autojs/autojs/model/explorer/Explorer.java b/app/src/main/java/org/autojs/autojs/model/explorer/Explorer.java
index cb8a5e39..a816a38a 100644
--- a/app/src/main/java/org/autojs/autojs/model/explorer/Explorer.java
+++ b/app/src/main/java/org/autojs/autojs/model/explorer/Explorer.java
@@ -1,6 +1,6 @@
 package org.autojs.autojs.model.explorer;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.util.LruCache;
 
 import com.stardust.pio.PFile;
@@ -87,14 +87,14 @@ public class Explorer {
         if (cachedParent != null) {
             cachedParent.addChild(item);
         }
-        mEventBus.post(new ExplorerChangeEvent(parent, CREATE, item));
+        mEventBus.post(new ExplorerChangeEvent(parent, CREATE, item, item));
     }
 
     @SuppressWarnings("unchecked")
     public void refreshAll() {
         if (mExplorerPageLruCache != null)
             mExplorerPageLruCache.evictAll();
-        mEventBus.post(new ExplorerChangeEvent(ALL));
+        mEventBus.post(ExplorerChangeEvent.EVENT_ALL);
     }
 
 
diff --git a/app/src/main/java/org/autojs/autojs/model/explorer/ExplorerChangeEvent.java b/app/src/main/java/org/autojs/autojs/model/explorer/ExplorerChangeEvent.java
index 825f9854..aac0b9b8 100644
--- a/app/src/main/java/org/autojs/autojs/model/explorer/ExplorerChangeEvent.java
+++ b/app/src/main/java/org/autojs/autojs/model/explorer/ExplorerChangeEvent.java
@@ -1,13 +1,18 @@
 package org.autojs.autojs.model.explorer;
 
+import com.stardust.util.ObjectHelper;
+
 public class ExplorerChangeEvent {
 
+
     public static final int REMOVE = 0;
     public static final int CREATE = 1;
     public static final int CHANGE = 2;
     public static final int ALL = 3;
     public static final int CHILDREN_CHANGE = 4;
 
+    public static final ExplorerChangeEvent EVENT_ALL = new ExplorerChangeEvent(ALL);
+
     private final int mAction;
     private final ExplorerItem mItem;
     private final ExplorerItem mNewItem;
@@ -21,10 +26,10 @@ public class ExplorerChangeEvent {
     }
 
     public ExplorerChangeEvent(ExplorerPage parent, int action, ExplorerItem item) {
-       this(parent, action, item, null);
+        this(parent, action, item, null);
     }
 
-    public ExplorerChangeEvent(int action) {
+    private ExplorerChangeEvent(int action) {
         this(null, action, null, null);
     }
 
@@ -43,4 +48,30 @@ public class ExplorerChangeEvent {
     public ExplorerPage getPage() {
         return mPage;
     }
+
+    @Override
+    public String toString() {
+        return "ExplorerChangeEvent{" +
+                "mAction=" + nameOfAction(mAction) +
+                ", mPage=" + mPage +
+                ", mItem=" + mItem +
+                ", mNewItem=" + mNewItem +
+                '}';
+    }
+
+    private static String nameOfAction(int action) {
+        switch (action) {
+            case ALL:
+                return "ALL";
+            case CHANGE:
+                return "CHANGE";
+            case CREATE:
+                return "CREATE";
+            case REMOVE:
+                return "REMOVE";
+            case CHILDREN_CHANGE:
+                return "CHILDREN_CHANGE";
+        }
+        throw new IllegalArgumentException("action = " + action);
+    }
 }
diff --git a/app/src/main/java/org/autojs/autojs/model/explorer/ExplorerDirPage.java b/app/src/main/java/org/autojs/autojs/model/explorer/ExplorerDirPage.java
index 55c0e552..5f27d3b0 100644
--- a/app/src/main/java/org/autojs/autojs/model/explorer/ExplorerDirPage.java
+++ b/app/src/main/java/org/autojs/autojs/model/explorer/ExplorerDirPage.java
@@ -1,8 +1,8 @@
 package org.autojs.autojs.model.explorer;
 
 import android.os.Build;
-import android.support.annotation.NonNull;
-import android.support.annotation.RequiresApi;
+import androidx.annotation.NonNull;
+import androidx.annotation.RequiresApi;
 
 import com.stardust.pio.PFile;
 
@@ -44,7 +44,7 @@ public class ExplorerDirPage extends ExplorerFileItem implements ExplorerPage {
 
     @Override
     public ExplorerFileItem rename(String newName) {
-        return new ExplorerDirPage(getFile().renameAndReturnNewFile(newName), getParent());
+        return new ExplorerDirPage(getFile().renameTo(newName), getParent());
     }
 
     protected int indexOf(ExplorerItem child){
diff --git a/app/src/main/java/org/autojs/autojs/model/explorer/ExplorerFileItem.java b/app/src/main/java/org/autojs/autojs/model/explorer/ExplorerFileItem.java
index 73fbf984..e042bc1b 100644
--- a/app/src/main/java/org/autojs/autojs/model/explorer/ExplorerFileItem.java
+++ b/app/src/main/java/org/autojs/autojs/model/explorer/ExplorerFileItem.java
@@ -2,6 +2,7 @@ package org.autojs.autojs.model.explorer;
 
 import com.stardust.pio.PFile;
 import com.stardust.util.ObjectHelper;
+import com.stardust.util.Objects;
 
 import org.autojs.autojs.model.script.ScriptFile;
 
@@ -71,7 +72,7 @@ public class ExplorerFileItem implements ExplorerItem {
     }
 
     public ExplorerFileItem rename(String newName) {
-        return new ExplorerFileItem(mFile.renameAndReturnNewFile(newName), getParent());
+        return new ExplorerFileItem(mFile.renameTo(newName), getParent());
     }
 
     @Override
@@ -102,4 +103,24 @@ public class ExplorerFileItem implements ExplorerItem {
         String type = getType();
         return type.equals("js") || type.equals("auto");
     }
+
+    @Override
+    public String toString() {
+        return getClass().getSimpleName() + "{" +
+                "mFile=" + mFile + "}";
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        ExplorerFileItem that = (ExplorerFileItem) o;
+        return Objects.equals(mFile, that.mFile);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hashCode(mFile);
+    }
 }
+
diff --git a/app/src/main/java/org/autojs/autojs/model/explorer/ExplorerProjectPage.java b/app/src/main/java/org/autojs/autojs/model/explorer/ExplorerProjectPage.java
index 0a56322e..9710d7a3 100644
--- a/app/src/main/java/org/autojs/autojs/model/explorer/ExplorerProjectPage.java
+++ b/app/src/main/java/org/autojs/autojs/model/explorer/ExplorerProjectPage.java
@@ -30,6 +30,6 @@ public class ExplorerProjectPage extends ExplorerDirPage {
 
     @Override
     public ExplorerFileItem rename(String newName) {
-        return new ExplorerProjectPage(getFile().renameAndReturnNewFile(newName), getParent(), mProjectConfig);
+        return new ExplorerProjectPage(getFile().renameTo(newName), getParent(), mProjectConfig);
     }
 }
diff --git a/app/src/main/java/org/autojs/autojs/model/indices/ClassSearchingItem.java b/app/src/main/java/org/autojs/autojs/model/indices/ClassSearchingItem.java
index d3963216..d9fbcecd 100644
--- a/app/src/main/java/org/autojs/autojs/model/indices/ClassSearchingItem.java
+++ b/app/src/main/java/org/autojs/autojs/model/indices/ClassSearchingItem.java
@@ -1,6 +1,6 @@
 package org.autojs.autojs.model.indices;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.util.Log;
 
 public abstract class ClassSearchingItem implements Comparable<ClassSearchingItem> {
diff --git a/app/src/main/java/org/autojs/autojs/model/sample/SampleFile.java b/app/src/main/java/org/autojs/autojs/model/sample/SampleFile.java
index 083dd646..07d38f5d 100644
--- a/app/src/main/java/org/autojs/autojs/model/sample/SampleFile.java
+++ b/app/src/main/java/org/autojs/autojs/model/sample/SampleFile.java
@@ -1,8 +1,8 @@
 package org.autojs.autojs.model.sample;
 
 import android.content.res.AssetManager;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.stardust.autojs.script.JavaScriptSource;
 import com.stardust.autojs.script.ScriptSource;
diff --git a/app/src/main/java/org/autojs/autojs/model/script/ScriptFile.java b/app/src/main/java/org/autojs/autojs/model/script/ScriptFile.java
index 60062f45..2cf2b6b5 100644
--- a/app/src/main/java/org/autojs/autojs/model/script/ScriptFile.java
+++ b/app/src/main/java/org/autojs/autojs/model/script/ScriptFile.java
@@ -1,18 +1,13 @@
 package org.autojs.autojs.model.script;
 
-import android.os.Environment;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import com.stardust.autojs.script.AutoFileSource;
 import com.stardust.autojs.script.JavaScriptFileSource;
 import com.stardust.autojs.script.ScriptSource;
 import com.stardust.pio.PFile;
-import com.stardust.pio.PFiles;
 
 import java.io.File;
-import java.io.FileFilter;
-import java.io.FilenameFilter;
-import java.util.ArrayList;
 
 /**
  * Created by Stardust on 2017/1/23.
diff --git a/app/src/main/java/org/autojs/autojs/model/script/Scripts.java b/app/src/main/java/org/autojs/autojs/model/script/Scripts.java
deleted file mode 100644
index 1d8b4449..00000000
--- a/app/src/main/java/org/autojs/autojs/model/script/Scripts.java
+++ /dev/null
@@ -1,159 +0,0 @@
-package org.autojs.autojs.model.script;
-
-import android.content.Context;
-import android.content.Intent;
-import android.net.Uri;
-import android.support.annotation.Nullable;
-import android.widget.Toast;
-
-import com.stardust.app.GlobalAppContext;
-import com.stardust.autojs.execution.ExecutionConfig;
-import com.stardust.autojs.execution.ScriptExecution;
-import com.stardust.autojs.execution.ScriptExecutionListener;
-import com.stardust.autojs.execution.SimpleScriptExecutionListener;
-import com.stardust.autojs.runtime.exception.ScriptInterruptedException;
-import com.stardust.autojs.script.ScriptSource;
-import com.stardust.util.IntentUtil;
-
-import org.autojs.autojs.Pref;
-import org.autojs.autojs.R;
-import org.autojs.autojs.autojs.AutoJs;
-import org.autojs.autojs.external.ScriptIntents;
-import org.autojs.autojs.external.fileprovider.AppFileProvider;
-import org.autojs.autojs.external.shortcut.Shortcut;
-import org.autojs.autojs.external.shortcut.ShortcutActivity;
-import org.autojs.autojs.ui.edit.EditActivity;
-
-import org.mozilla.javascript.RhinoException;
-
-import java.io.File;
-import java.io.FileFilter;
-
-/**
- * Created by Stardust on 2017/5/3.
- */
-
-public class Scripts {
-
-    public static final String ACTION_ON_EXECUTION_FINISHED = "ACTION_ON_EXECUTION_FINISHED";
-    public static final String EXTRA_EXCEPTION_MESSAGE = "message";
-    public static final String EXTRA_EXCEPTION_LINE_NUMBER = "lineNumber";
-    public static final String EXTRA_EXCEPTION_COLUMN_NUMBER = "columnNumber";
-
-    public static final FileFilter FILE_FILTER = file ->
-            file.isDirectory() || file.getName().endsWith(".js") || file.getName().endsWith(".auto");
-
-    private static final ScriptExecutionListener BROADCAST_SENDER_SCRIPT_EXECUTION_LISTENER = new SimpleScriptExecutionListener() {
-
-        @Override
-        public void onSuccess(ScriptExecution execution, Object result) {
-            GlobalAppContext.get().sendBroadcast(new Intent(ACTION_ON_EXECUTION_FINISHED));
-        }
-
-        @Override
-        public void onException(ScriptExecution execution, Exception e) {
-            RhinoException rhinoException = getRhinoException(e);
-            int line = -1, col = 0;
-            if (rhinoException != null) {
-                line = rhinoException.lineNumber();
-                col = rhinoException.columnNumber();
-            }
-            if (ScriptInterruptedException.causedByInterrupted(e)) {
-                GlobalAppContext.get().sendBroadcast(new Intent(ACTION_ON_EXECUTION_FINISHED)
-                        .putExtra(EXTRA_EXCEPTION_LINE_NUMBER, line)
-                        .putExtra(EXTRA_EXCEPTION_COLUMN_NUMBER, col));
-            } else {
-                GlobalAppContext.get().sendBroadcast(new Intent(ACTION_ON_EXECUTION_FINISHED)
-                        .putExtra(EXTRA_EXCEPTION_MESSAGE, e.getMessage())
-                        .putExtra(EXTRA_EXCEPTION_LINE_NUMBER, line)
-                        .putExtra(EXTRA_EXCEPTION_COLUMN_NUMBER, col));
-            }
-        }
-
-    };
-
-
-    public static void openByOtherApps(String path) {
-        IntentUtil.viewFile(GlobalAppContext.get(), path, "text/plain", AppFileProvider.AUTHORITY);
-    }
-
-    public static void openByOtherApps(File file) {
-        openByOtherApps(file.getPath());
-    }
-
-    public static void createShortcut(ScriptFile scriptFile) {
-        new Shortcut(GlobalAppContext.get()).name(scriptFile.getSimplifiedName())
-                .targetClass(ShortcutActivity.class)
-                .iconRes(R.drawable.ic_node_js_black)
-                .extras(new Intent().putExtra(ScriptIntents.EXTRA_KEY_PATH, scriptFile.getPath()))
-                .send();
-    }
-
-
-    public static void edit(ScriptFile file) {
-        EditActivity.editFile(GlobalAppContext.get(), file.getSimplifiedName(), file.getPath());
-    }
-
-    public static void edit(String path) {
-        edit(new ScriptFile(path));
-    }
-
-    public static ScriptExecution run(ScriptFile file) {
-        try {
-            return AutoJs.getInstance().getScriptEngineService().execute(file.toSource(), new ExecutionConfig()
-                    .executePath(file.getParent()));
-        } catch (Exception e) {
-            e.printStackTrace();
-            Toast.makeText(GlobalAppContext.get(), e.getMessage(), Toast.LENGTH_LONG).show();
-            return null;
-        }
-    }
-
-
-    public static ScriptExecution run(ScriptSource source) {
-        try {
-            return AutoJs.getInstance().getScriptEngineService().execute(source, new ExecutionConfig()
-                    .executePath(Pref.getScriptDirPath())
-                    .requirePath(Pref.getScriptDirPath()));
-        } catch (Exception e) {
-            e.printStackTrace();
-            Toast.makeText(GlobalAppContext.get(), e.getMessage(), Toast.LENGTH_LONG).show();
-            return null;
-        }
-    }
-
-    public static ScriptExecution runWithBroadcastSender(File file) {
-        return AutoJs.getInstance().getScriptEngineService().execute(new ScriptFile(file).toSource(), BROADCAST_SENDER_SCRIPT_EXECUTION_LISTENER,
-                new ExecutionConfig().executePath(file.getParent()));
-    }
-
-
-    public static ScriptExecution runRepeatedly(ScriptFile scriptFile, int loopTimes, long delay, long interval) {
-        ScriptSource source = scriptFile.toSource();
-        String directoryPath = scriptFile.getParent();
-        return AutoJs.getInstance().getScriptEngineService().execute(source, new ExecutionConfig()
-                .executePath(directoryPath)
-                .loop(delay, loopTimes, interval));
-    }
-
-    @Nullable
-    public static RhinoException getRhinoException(Throwable e) {
-        while (e != null) {
-            if (e instanceof RhinoException) {
-                return (RhinoException) e;
-            }
-            e = e.getCause();
-        }
-        return null;
-    }
-
-    public static void send(ScriptFile file) {
-        Context context = GlobalAppContext.get();
-        context.startActivity(Intent.createChooser(new Intent(Intent.ACTION_SEND)
-                        .setType("text/plain")
-                        .putExtra(Intent.EXTRA_STREAM, IntentUtil.getUriOfFile(context, file.getPath(), AppFileProvider.AUTHORITY)),
-                GlobalAppContext.getString(R.string.text_send)
-        ).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
-
-    }
-}
diff --git a/app/src/main/java/org/autojs/autojs/model/script/Scripts.kt b/app/src/main/java/org/autojs/autojs/model/script/Scripts.kt
new file mode 100644
index 00000000..c81870d0
--- /dev/null
+++ b/app/src/main/java/org/autojs/autojs/model/script/Scripts.kt
@@ -0,0 +1,160 @@
+package org.autojs.autojs.model.script
+
+import android.content.Context
+import android.content.Intent
+import android.net.Uri
+import androidx.annotation.Nullable
+import android.widget.Toast
+
+import com.stardust.app.GlobalAppContext
+import com.stardust.autojs.execution.ExecutionConfig
+import com.stardust.autojs.execution.ScriptExecution
+import com.stardust.autojs.execution.ScriptExecutionListener
+import com.stardust.autojs.execution.SimpleScriptExecutionListener
+import com.stardust.autojs.runtime.exception.ScriptInterruptedException
+import com.stardust.autojs.script.ScriptSource
+import com.stardust.util.IntentUtil
+
+import org.autojs.autojs.Pref
+import org.autojs.autojs.R
+import org.autojs.autojs.autojs.AutoJs
+import org.autojs.autojs.external.ScriptIntents
+import org.autojs.autojs.external.fileprovider.AppFileProvider
+import org.autojs.autojs.external.shortcut.Shortcut
+import org.autojs.autojs.external.shortcut.ShortcutActivity
+import org.autojs.autojs.ui.edit.EditActivity
+
+import org.mozilla.javascript.RhinoException
+
+import java.io.File
+import java.io.FileFilter
+
+/**
+ * Created by Stardust on 2017/5/3.
+ */
+
+object Scripts {
+
+    const val ACTION_ON_EXECUTION_FINISHED = "ACTION_ON_EXECUTION_FINISHED"
+    const val EXTRA_EXCEPTION_MESSAGE = "message"
+    const val EXTRA_EXCEPTION_LINE_NUMBER = "lineNumber"
+    const val EXTRA_EXCEPTION_COLUMN_NUMBER = "columnNumber"
+
+    val FILE_FILTER = FileFilter { file ->
+        file.isDirectory || file.name.endsWith(".js")
+                || file.name.endsWith(".auto")
+    }
+
+    private val BROADCAST_SENDER_SCRIPT_EXECUTION_LISTENER = object : SimpleScriptExecutionListener() {
+
+        override fun onSuccess(execution: ScriptExecution, result: Any?) {
+            GlobalAppContext.get().sendBroadcast(Intent(ACTION_ON_EXECUTION_FINISHED))
+        }
+
+        override fun onException(execution: ScriptExecution, e: Throwable) {
+            val rhinoException = getRhinoException(e)
+            var line = -1
+            var col = 0
+            if (rhinoException != null) {
+                line = rhinoException.lineNumber()
+                col = rhinoException.columnNumber()
+            }
+            if (ScriptInterruptedException.causedByInterrupted(e)) {
+                GlobalAppContext.get().sendBroadcast(Intent(ACTION_ON_EXECUTION_FINISHED)
+                        .putExtra(EXTRA_EXCEPTION_LINE_NUMBER, line)
+                        .putExtra(EXTRA_EXCEPTION_COLUMN_NUMBER, col))
+            } else {
+                GlobalAppContext.get().sendBroadcast(Intent(ACTION_ON_EXECUTION_FINISHED)
+                        .putExtra(EXTRA_EXCEPTION_MESSAGE, e.message)
+                        .putExtra(EXTRA_EXCEPTION_LINE_NUMBER, line)
+                        .putExtra(EXTRA_EXCEPTION_COLUMN_NUMBER, col))
+            }
+        }
+
+    }
+
+
+    fun openByOtherApps(uri: Uri) {
+        IntentUtil.viewFile(GlobalAppContext.get(), uri, "text/plain", AppFileProvider.AUTHORITY)
+    }
+
+    fun openByOtherApps(file: File) {
+        openByOtherApps(Uri.fromFile(file))
+    }
+
+    fun createShortcut(scriptFile: ScriptFile) {
+        Shortcut(GlobalAppContext.get()).name(scriptFile.simplifiedName)
+                .targetClass(ShortcutActivity::class.java)
+                .iconRes(R.drawable.ic_node_js_black)
+                .extras(Intent().putExtra(ScriptIntents.EXTRA_KEY_PATH, scriptFile.path))
+                .send()
+    }
+
+
+    fun edit(file: ScriptFile) {
+        EditActivity.editFile(GlobalAppContext.get(), file.simplifiedName, file.path)
+    }
+
+    fun edit(path: String) {
+        edit(ScriptFile(path))
+    }
+
+    fun run(file: ScriptFile): ScriptExecution? {
+        try {
+            return AutoJs.getInstance().scriptEngineService.execute(file.toSource(),
+                    ExecutionConfig(workingDirectory = file.parent))
+        } catch (e: Exception) {
+            e.printStackTrace()
+            Toast.makeText(GlobalAppContext.get(), e.message, Toast.LENGTH_LONG).show()
+            return null
+        }
+
+    }
+
+
+    fun run(source: ScriptSource): ScriptExecution? {
+        return try {
+            AutoJs.getInstance().scriptEngineService.execute(source, ExecutionConfig(workingDirectory = Pref.getScriptDirPath()))
+        } catch (e: Exception) {
+            e.printStackTrace()
+            Toast.makeText(GlobalAppContext.get(), e.message, Toast.LENGTH_LONG).show()
+            null
+        }
+
+    }
+
+    fun runWithBroadcastSender(file: File): ScriptExecution {
+        return AutoJs.getInstance().scriptEngineService.execute(ScriptFile(file).toSource(), BROADCAST_SENDER_SCRIPT_EXECUTION_LISTENER,
+                ExecutionConfig(workingDirectory = file.parent))
+    }
+
+
+    fun runRepeatedly(scriptFile: ScriptFile, loopTimes: Int, delay: Long, interval: Long): ScriptExecution {
+        val source = scriptFile.toSource()
+        val directoryPath = scriptFile.parent
+        return AutoJs.getInstance().scriptEngineService.execute(source, ExecutionConfig(workingDirectory = directoryPath,
+                delay = delay, loopTimes = loopTimes, interval = interval))
+    }
+
+    @Nullable
+    fun getRhinoException(e: Throwable?): RhinoException? {
+        var e = e
+        while (e != null) {
+            if (e is RhinoException) {
+                return e
+            }
+            e = e.cause
+        }
+        return null
+    }
+
+    fun send(file: ScriptFile) {
+        val context = GlobalAppContext.get()
+        context.startActivity(Intent.createChooser(Intent(Intent.ACTION_SEND)
+                .setType("text/plain")
+                .putExtra(Intent.EXTRA_STREAM, IntentUtil.getUriOfFile(context, file.path, AppFileProvider.AUTHORITY)),
+                GlobalAppContext.getString(R.string.text_send)
+        ).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK))
+
+    }
+}
diff --git a/app/src/main/java/org/autojs/autojs/network/Glides.java b/app/src/main/java/org/autojs/autojs/network/Glides.java
deleted file mode 100644
index f7ad3ade..00000000
--- a/app/src/main/java/org/autojs/autojs/network/Glides.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package org.autojs.autojs.network;
-
-import com.bumptech.glide.annotation.GlideModule;
-import com.bumptech.glide.module.AppGlideModule;
-
-/**
- * Created by Stardust on 2017/10/26.
- */
-@GlideModule
-public class Glides extends AppGlideModule {
-}
diff --git a/app/src/main/java/org/autojs/autojs/pluginclient/DevPluginResponseHandler.java b/app/src/main/java/org/autojs/autojs/pluginclient/DevPluginResponseHandler.java
index a94c7e44..189df3a0 100644
--- a/app/src/main/java/org/autojs/autojs/pluginclient/DevPluginResponseHandler.java
+++ b/app/src/main/java/org/autojs/autojs/pluginclient/DevPluginResponseHandler.java
@@ -1,23 +1,36 @@
 package org.autojs.autojs.pluginclient;
 
+import android.annotation.SuppressLint;
 import android.text.TextUtils;
+import android.widget.Toast;
 
 import com.google.gson.JsonElement;
 import com.google.gson.JsonNull;
 import com.google.gson.JsonObject;
 import com.stardust.app.GlobalAppContext;
 import com.stardust.autojs.execution.ScriptExecution;
+import com.stardust.autojs.project.ProjectLauncher;
 import com.stardust.autojs.script.StringScriptSource;
+import com.stardust.io.Zip;
 import com.stardust.pio.PFiles;
+import com.stardust.util.MD5;
 
 import org.autojs.autojs.Pref;
 import org.autojs.autojs.R;
 import org.autojs.autojs.autojs.AutoJs;
 import org.autojs.autojs.model.script.Scripts;
 
+import java.io.ByteArrayInputStream;
 import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
 import java.util.HashMap;
 
+import io.reactivex.Observable;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.schedulers.Schedulers;
+
 /**
  * Created by Stardust on 2017/5/11.
  */
@@ -32,7 +45,7 @@ public class DevPluginResponseHandler implements Handler {
                         String name = getName(data);
                         String id = data.get("id").getAsString();
                         runScript(id, name, script);
-                        return false;
+                        return true;
                     })
                     .handler("stop", data -> {
                         String id = data.get("id").getAsString();
@@ -43,7 +56,7 @@ public class DevPluginResponseHandler implements Handler {
                         String script = data.get("script").getAsString();
                         String name = getName(data);
                         saveScript(name, script);
-                        return false;
+                        return true;
                     })
                     .handler("rerun", data -> {
                         String id = data.get("id").getAsString();
@@ -51,30 +64,75 @@ public class DevPluginResponseHandler implements Handler {
                         String name = getName(data);
                         stopScript(id);
                         runScript(id, name, script);
-                        return false;
+                        return true;
                     })
                     .handler("stopAll", data -> {
                         AutoJs.getInstance().getScriptEngineService().stopAllAndToast();
-                        return false;
+                        return true;
+                    }))
+            .handler("bytes_command", new Router("command")
+                    .handler("run_project", data -> {
+                        launchProject(data.get("dir").getAsString());
+                        return true;
+                    })
+                    .handler("save_project", data -> {
+                        saveProject(data.get("name").getAsString(), data.get("dir").getAsString());
+                        return true;
                     }));
 
 
     private HashMap<String, ScriptExecution> mScriptExecutions = new HashMap<>();
+    private final File mCacheDir;
+
+    public DevPluginResponseHandler(File cacheDir) {
+        mCacheDir = cacheDir;
+        if (cacheDir.exists()) {
+            if (cacheDir.isDirectory()) {
+                PFiles.deleteFilesOfDir(cacheDir);
+            } else {
+                cacheDir.delete();
+                cacheDir.mkdirs();
+            }
+        }
+    }
 
     @Override
     public boolean handle(JsonObject data) {
         return mRouter.handle(data);
     }
 
+    public Observable<File> handleBytes(JsonObject data, JsonWebSocket.Bytes bytes) {
+        String id = data.get("data").getAsJsonObject().get("id").getAsString();
+        String idMd5 = MD5.md5(id);
+        return Observable.fromCallable(() -> {
+            File dir = new File(mCacheDir, idMd5);
+            Zip.unzip(new ByteArrayInputStream(bytes.byteString.toByteArray()), dir);
+            return dir;
+        })
+                .subscribeOn(Schedulers.io());
+    }
+
     private void runScript(String viewId, String name, String script) {
         if (TextUtils.isEmpty(name)) {
             name = "[" + viewId + "]";
         } else {
             name = PFiles.getNameWithoutExtension(name);
         }
-        mScriptExecutions.put(viewId, Scripts.run(new StringScriptSource("[remote]" + name, script)));
+        mScriptExecutions.put(viewId, Scripts.INSTANCE.run(new StringScriptSource("[remote]" + name, script)));
     }
 
+
+    private void launchProject(String dir) {
+        try {
+            new ProjectLauncher(dir)
+                    .launch(AutoJs.getInstance().getScriptEngineService());
+        } catch (Exception e) {
+            e.printStackTrace();
+            GlobalAppContext.toast(R.string.text_invalid_project);
+        }
+    }
+
+
     private void stopScript(String viewId) {
         ScriptExecution execution = mScriptExecutions.get(viewId);
         if (execution != null) {
@@ -104,4 +162,42 @@ public class DevPluginResponseHandler implements Handler {
         PFiles.write(file, script);
         GlobalAppContext.toast(R.string.text_script_save_successfully);
     }
+
+
+    @SuppressLint("CheckResult")
+    private void saveProject(String name, String dir) {
+        if (TextUtils.isEmpty(name)) {
+            name = "untitled";
+        }
+        name = PFiles.getNameWithoutExtension(name);
+        File toDir = new File(Pref.getScriptDirPath(), name);
+        Observable.fromCallable(() -> {
+            copyDir(new File(dir), toDir);
+            return toDir.getPath();
+        }).subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(dest ->
+                                GlobalAppContext.toast(R.string.text_project_save_success, dest),
+                        err ->
+                                GlobalAppContext.toast(R.string.text_project_save_error, err.getMessage())
+                        );
+
+    }
+
+    private void copyDir(File fromDir, File toDir) throws FileNotFoundException {
+        toDir.mkdirs();
+        File[] files = fromDir.listFiles();
+        if (files == null || files.length == 0) {
+            return;
+        }
+        for (File file : files) {
+            if (file.isDirectory()) {
+                copyDir(file, new File(toDir, file.getName()));
+            } else {
+                FileOutputStream fos = new FileOutputStream(new File(toDir, file.getName()));
+                PFiles.write(new FileInputStream(file), fos, true);
+            }
+        }
+    }
+
 }
diff --git a/app/src/main/java/org/autojs/autojs/pluginclient/DevPluginService.java b/app/src/main/java/org/autojs/autojs/pluginclient/DevPluginService.java
index 51de8c25..1da3449b 100644
--- a/app/src/main/java/org/autojs/autojs/pluginclient/DevPluginService.java
+++ b/app/src/main/java/org/autojs/autojs/pluginclient/DevPluginService.java
@@ -4,20 +4,23 @@ import android.annotation.SuppressLint;
 import android.os.Build;
 import android.os.Handler;
 import android.os.Looper;
-import android.support.annotation.AnyThread;
-import android.support.annotation.MainThread;
-import android.support.annotation.WorkerThread;
+import androidx.annotation.AnyThread;
+import androidx.annotation.MainThread;
+import androidx.annotation.WorkerThread;
 import android.util.Log;
 import android.util.Pair;
 
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
+import com.google.gson.JsonPrimitive;
+import com.stardust.app.GlobalAppContext;
 import com.stardust.util.MapBuilder;
 
 import org.autojs.autojs.BuildConfig;
 
-import java.io.IOException;
+import java.io.File;
 import java.net.SocketTimeoutException;
+import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
@@ -36,6 +39,7 @@ public class DevPluginService {
     private static final int CLIENT_VERSION = 2;
     private static final String LOG_TAG = "DevPluginService";
     private static final String TYPE_HELLO = "hello";
+    private static final String TYPE_BYTES_COMMAND = "bytes_command";
     private static final long HANDSHAKE_TIMEOUT = 10 * 1000;
 
     public static class State {
@@ -68,15 +72,21 @@ public class DevPluginService {
     private static final int PORT = 9317;
     private static DevPluginService sInstance = new DevPluginService();
     private final PublishSubject<State> mConnectionState = PublishSubject.create();
-    private final DevPluginResponseHandler mResponseHandler = new DevPluginResponseHandler();
-    private final Handler mHandshakeTimeoutHandler = new Handler(Looper.getMainLooper());
-
+    private final DevPluginResponseHandler mResponseHandler;
+    private final HashMap<String, JsonWebSocket.Bytes> mBytes = new HashMap<>();
+    private final HashMap<String, JsonObject> mRequiredBytesCommands = new HashMap<>();
+    private final Handler mHandler = new Handler(Looper.getMainLooper());
     private volatile JsonWebSocket mSocket;
 
     public static DevPluginService getInstance() {
         return sInstance;
     }
 
+    public DevPluginService() {
+        File cache = new File(GlobalAppContext.get().getCacheDir(), "remote_project");
+        mResponseHandler = new DevPluginResponseHandler(cache);
+    }
+
     @AnyThread
     public boolean isConnected() {
         return mSocket != null && !mSocket.isClosed();
@@ -134,14 +144,22 @@ public class DevPluginService {
                 .build()))
                 .doOnNext(socket -> {
                     mSocket = socket;
-                    socket.data()
-                            .observeOn(AndroidSchedulers.mainThread())
-                            .doOnComplete(() -> mConnectionState.onNext(new State(State.DISCONNECTED)))
-                            .subscribe(data -> onSocketData(socket, data), this::onSocketError);
+                    subscribeMessage(socket);
                     sayHelloToServer(socket);
                 });
     }
 
+    @SuppressLint("CheckResult")
+    private void subscribeMessage(JsonWebSocket socket) {
+        socket.data()
+                .observeOn(AndroidSchedulers.mainThread())
+                .doOnComplete(() -> mConnectionState.onNext(new State(State.DISCONNECTED)))
+                .subscribe(data -> onSocketData(socket, data), this::onSocketError);
+        socket.bytes()
+                .doOnComplete(() -> mConnectionState.onNext(new State(State.DISCONNECTED)))
+                .subscribe(data -> onSocketData(socket, data), this::onSocketError);
+    }
+
     @MainThread
     private void onSocketError(Throwable e) {
         e.printStackTrace();
@@ -158,24 +176,64 @@ public class DevPluginService {
             Log.w(LOG_TAG, "onSocketData: not json object: " + element);
             return;
         }
-        JsonObject obj = element.getAsJsonObject();
-        JsonElement type = obj.get("type");
-        if (type != null && type.isJsonPrimitive() && type.getAsString().equals(TYPE_HELLO)) {
-            onServerHello(jsonWebSocket, obj);
-            return;
+        try {
+            JsonObject obj = element.getAsJsonObject();
+            JsonElement typeElement = obj.get("type");
+            if (typeElement == null || !typeElement.isJsonPrimitive()) {
+                return;
+            }
+            String type = typeElement.getAsString();
+            if (type.equals(TYPE_HELLO)) {
+                onServerHello(jsonWebSocket, obj);
+                return;
+            }
+            if (TYPE_BYTES_COMMAND.equals(type)) {
+                String md5 = obj.get("md5").getAsString();
+                JsonWebSocket.Bytes bytes = mBytes.remove(md5);
+                if (bytes != null) {
+                    handleBytes(obj, bytes);
+                } else {
+                    mRequiredBytesCommands.put(md5, obj);
+                }
+                return;
+            }
+            mResponseHandler.handle(obj);
+        } catch (Exception e) {
+            e.printStackTrace();
         }
-        mResponseHandler.handle(obj);
+
+    }
+
+    @SuppressLint("CheckResult")
+    private void handleBytes(JsonObject obj, JsonWebSocket.Bytes bytes) {
+        mResponseHandler.handleBytes(obj, bytes)
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(dir -> {
+                    obj.get("data").getAsJsonObject().add("dir", new JsonPrimitive(dir.getPath()));
+                    mResponseHandler.handle(obj);
+                });
+
     }
 
     @WorkerThread
-    private void sayHelloToServer(JsonWebSocket socket) throws IOException {
+    private void onSocketData(JsonWebSocket jsonWebSocket, JsonWebSocket.Bytes bytes) {
+        JsonObject command = mRequiredBytesCommands.remove(bytes.md5);
+        if (command != null) {
+            handleBytes(command, bytes);
+        } else {
+            mBytes.put(bytes.md5, bytes);
+        }
+    }
+
+    @WorkerThread
+    private void sayHelloToServer(JsonWebSocket socket) {
         writeMap(socket, TYPE_HELLO, new MapBuilder<String, Object>()
                 .put("device_name", Build.BRAND + " " + Build.MODEL)
                 .put("client_version", CLIENT_VERSION)
                 .put("app_version", BuildConfig.VERSION_NAME)
                 .put("app_version_code", BuildConfig.VERSION_CODE)
                 .build());
-        mHandshakeTimeoutHandler.postDelayed(() -> {
+        mHandler.postDelayed(() -> {
             if (mSocket != socket && !socket.isClosed()) {
                 onHandshakeTimeout(socket);
             }
diff --git a/app/src/main/java/org/autojs/autojs/pluginclient/JsonWebSocket.java b/app/src/main/java/org/autojs/autojs/pluginclient/JsonWebSocket.java
index 641adf46..f81301da 100644
--- a/app/src/main/java/org/autojs/autojs/pluginclient/JsonWebSocket.java
+++ b/app/src/main/java/org/autojs/autojs/pluginclient/JsonWebSocket.java
@@ -19,14 +19,28 @@ import okhttp3.Request;
 import okhttp3.Response;
 import okhttp3.WebSocket;
 import okhttp3.WebSocketListener;
+import okio.ByteString;
 
 public class JsonWebSocket extends WebSocketListener {
 
+    public static class Bytes {
+        public final String md5;
+        public final ByteString byteString;
+        public final long timestamp;
+
+        public Bytes(String md5, ByteString byteString) {
+            this.md5 = md5;
+            this.byteString = byteString;
+            this.timestamp = System.currentTimeMillis();
+        }
+    }
+
     private static final String LOG_TAG = "JsonWebSocket";
 
     private final WebSocket mWebSocket;
     private final JsonParser mJsonParser = new JsonParser();
     private final PublishSubject<JsonElement> mJsonElementPublishSubject = PublishSubject.create();
+    private final PublishSubject<Bytes> mBytesPublishSubject = PublishSubject.create();
     private volatile boolean mClosed = false;
 
     public JsonWebSocket(OkHttpClient client, Request request) {
@@ -35,14 +49,24 @@ public class JsonWebSocket extends WebSocketListener {
 
     @Override
     public void onMessage(WebSocket webSocket, String text) {
-        Log.d(LOG_TAG, "onMessage: " + text);
+        Log.d(LOG_TAG, "onMessage: text = " + text);
         dispatchJson(text);
     }
 
+    @Override
+    public void onMessage(WebSocket webSocket, ByteString bytes) {
+        Log.d(LOG_TAG, "onMessage: ByteString = " + bytes.toString());
+        mBytesPublishSubject.onNext(new Bytes(bytes.md5().hex(), bytes));
+    }
+
     public Observable<JsonElement> data() {
         return mJsonElementPublishSubject;
     }
 
+    public Observable<Bytes> bytes(){
+        return mBytesPublishSubject;
+    }
+
     public boolean write(JsonElement element) {
         String json = element.toString();
         Log.d(LOG_TAG, "write: length = " + json.length() + ", json = " + element);
diff --git a/app/src/main/java/org/autojs/autojs/storage/database/IntentTaskDatabase.java b/app/src/main/java/org/autojs/autojs/storage/database/IntentTaskDatabase.java
index 9a8803d3..5e9200f9 100644
--- a/app/src/main/java/org/autojs/autojs/storage/database/IntentTaskDatabase.java
+++ b/app/src/main/java/org/autojs/autojs/storage/database/IntentTaskDatabase.java
@@ -11,10 +11,10 @@ import org.autojs.autojs.timing.IntentTask;
 
 public class IntentTaskDatabase extends Database<IntentTask> {
 
-    private static final int VERSION = 1;
+    private static final int VERSION = 2;
     private static final String NAME = "IntentTaskDatabase";
 
-    public IntentTaskDatabase(Context context){
+    public IntentTaskDatabase(Context context) {
         super(new SQLHelper(context), IntentTask.TABLE);
     }
 
@@ -25,6 +25,7 @@ public class IntentTaskDatabase extends Database<IntentTask> {
         values.put("action", model.getAction());
         values.put("category", model.getCategory());
         values.put("data_type", model.getDataType());
+        values.put("local", model.isLocal() ? 1 : 0);
         return values;
     }
 
@@ -36,6 +37,7 @@ public class IntentTaskDatabase extends Database<IntentTask> {
         task.setAction(cursor.getString(2));
         task.setCategory(cursor.getString(3));
         task.setDataType(cursor.getString(4));
+        task.setLocal(cursor.getInt(5) != 0);
         return task;
     }
 
@@ -53,12 +55,16 @@ public class IntentTaskDatabase extends Database<IntentTask> {
                     "`script_path` TEXT NOT NULL ON CONFLICT FAIL, " +
                     "`action` TEXT, " +
                     "`category` TEXT, " +
-                    "`data_type` TEXT);");
+                    "`data_type` TEXT, " +
+                    "`local` INT);");
         }
 
         @Override
         public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
-
+            if (oldVersion == 1 && newVersion == 2) {
+                db.execSQL("ALTER TABLE " + IntentTask.TABLE + "\n" +
+                        "ADD local INT");
+            }
         }
     }
 }
diff --git a/app/src/main/java/org/autojs/autojs/storage/file/TmpScriptFiles.java b/app/src/main/java/org/autojs/autojs/storage/file/TmpScriptFiles.java
index b5d433e9..5f436bba 100644
--- a/app/src/main/java/org/autojs/autojs/storage/file/TmpScriptFiles.java
+++ b/app/src/main/java/org/autojs/autojs/storage/file/TmpScriptFiles.java
@@ -13,7 +13,6 @@ import java.io.IOException;
 
 public class TmpScriptFiles {
 
-
     public static File create(Context context) throws IOException {
         ensureTmpDir(context);
         File tmp = new File(getTmpDir(context), "tmp-" + System.currentTimeMillis() + ".js");
diff --git a/app/src/main/java/org/autojs/autojs/theme/ThemeColorManagerCompat.java b/app/src/main/java/org/autojs/autojs/theme/ThemeColorManagerCompat.java
index 23c2bdee..ed75fab3 100644
--- a/app/src/main/java/org/autojs/autojs/theme/ThemeColorManagerCompat.java
+++ b/app/src/main/java/org/autojs/autojs/theme/ThemeColorManagerCompat.java
@@ -1,8 +1,16 @@
 package org.autojs.autojs.theme;
 
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.preference.PreferenceManager;
+import androidx.core.content.ContextCompat;
+import androidx.appcompat.app.AppCompatDelegate;
+
 import com.stardust.app.GlobalAppContext;
-import org.autojs.autojs.*;
+
 import org.autojs.autojs.R;
+
+import com.stardust.theme.ThemeColor;
 import com.stardust.theme.ThemeColorManager;
 
 /**
@@ -11,6 +19,14 @@ import com.stardust.theme.ThemeColorManager;
 
 public class ThemeColorManagerCompat {
 
+    private static SharedPreferences sSharedPreferences;
+    private static Context sContext;
+    private static SharedPreferences.OnSharedPreferenceChangeListener sPreferenceChangeListener = (sharedPreferences, key) -> {
+        if (key.equals(sContext.getString(R.string.key_night_mode))) {
+            setNightModeEnabled(sharedPreferences.getBoolean(key, false));
+        }
+    };
+
     public static int getColorPrimary() {
         int color = ThemeColorManager.getColorPrimary();
         if (color == 0) {
@@ -19,4 +35,29 @@ public class ThemeColorManagerCompat {
             return color;
         }
     }
+
+    public static void setNightModeEnabled(boolean enabled) {
+        if (enabled) {
+            AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
+            ThemeColor currentTheme = ThemeColor.fromPreferences(PreferenceManager.getDefaultSharedPreferences(sContext), null);
+            if (currentTheme != null) {
+                currentTheme.saveIn(sSharedPreferences);
+            }
+            ThemeColorManager.setThemeColor(ContextCompat.getColor(sContext, R.color.theme_color_black));
+        } else {
+            AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);
+            ThemeColor previousTheme = ThemeColor.fromPreferences(sSharedPreferences, null);
+            if (previousTheme != null) {
+                ThemeColorManager.setThemeColor(previousTheme.colorPrimary);
+            }
+        }
+    }
+
+    public static void init(Context context, ThemeColor defaultThemeColor) {
+        sContext = context;
+        sSharedPreferences = context.getSharedPreferences("theme_color", Context.MODE_PRIVATE);
+        ThemeColorManager.setDefaultThemeColor(defaultThemeColor);
+        ThemeColorManager.init(context);
+        PreferenceManager.getDefaultSharedPreferences(context).registerOnSharedPreferenceChangeListener(sPreferenceChangeListener);
+    }
 }
diff --git a/app/src/main/java/org/autojs/autojs/theme/dialog/ThemeColorMaterialDialogBuilder.java b/app/src/main/java/org/autojs/autojs/theme/dialog/ThemeColorMaterialDialogBuilder.java
index add6b009..f132049d 100644
--- a/app/src/main/java/org/autojs/autojs/theme/dialog/ThemeColorMaterialDialogBuilder.java
+++ b/app/src/main/java/org/autojs/autojs/theme/dialog/ThemeColorMaterialDialogBuilder.java
@@ -1,7 +1,7 @@
 package org.autojs.autojs.theme.dialog;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.afollestad.materialdialogs.MaterialDialog;
 import com.stardust.theme.ThemeColor;
diff --git a/app/src/main/java/org/autojs/autojs/theme/widget/ThemeColorImageViewCompat.java b/app/src/main/java/org/autojs/autojs/theme/widget/ThemeColorImageViewCompat.java
index 5ef27f1f..3faf1eeb 100644
--- a/app/src/main/java/org/autojs/autojs/theme/widget/ThemeColorImageViewCompat.java
+++ b/app/src/main/java/org/autojs/autojs/theme/widget/ThemeColorImageViewCompat.java
@@ -2,7 +2,7 @@ package org.autojs.autojs.theme.widget;
 
 import android.content.Context;
 import android.graphics.PorterDuff;
-import android.support.v7.widget.AppCompatImageView;
+import androidx.appcompat.widget.AppCompatImageView;
 import android.util.AttributeSet;
 
 import com.stardust.theme.ThemeColor;
diff --git a/app/src/main/java/org/autojs/autojs/theme/widget/ThemeColorSwipeRefreshLayout.java b/app/src/main/java/org/autojs/autojs/theme/widget/ThemeColorSwipeRefreshLayout.java
index 7ee92daa..057a23f4 100644
--- a/app/src/main/java/org/autojs/autojs/theme/widget/ThemeColorSwipeRefreshLayout.java
+++ b/app/src/main/java/org/autojs/autojs/theme/widget/ThemeColorSwipeRefreshLayout.java
@@ -1,7 +1,7 @@
 package org.autojs.autojs.theme.widget;
 
 import android.content.Context;
-import android.support.v4.widget.SwipeRefreshLayout;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 import android.util.AttributeSet;
 
 import com.stardust.theme.ThemeColor;
diff --git a/app/src/main/java/org/autojs/autojs/timing/IntentTask.java b/app/src/main/java/org/autojs/autojs/timing/IntentTask.java
index 1937ea84..e271d753 100644
--- a/app/src/main/java/org/autojs/autojs/timing/IntentTask.java
+++ b/app/src/main/java/org/autojs/autojs/timing/IntentTask.java
@@ -16,6 +16,8 @@ public class IntentTask extends BaseModel {
 
     private String mDataType;
 
+    private boolean mLocal;
+
     public IntentFilter getIntentFilter() {
         IntentFilter filter = new IntentFilter();
         if (mAction != null) {
@@ -65,4 +67,12 @@ public class IntentTask extends BaseModel {
     public void setDataType(String dataType) {
         mDataType = dataType;
     }
+
+    public boolean isLocal() {
+        return mLocal;
+    }
+
+    public void setLocal(boolean local) {
+        mLocal = local;
+    }
 }
diff --git a/app/src/main/java/org/autojs/autojs/timing/TimedTask.java b/app/src/main/java/org/autojs/autojs/timing/TimedTask.java
index 63a861ac..b0b20a94 100644
--- a/app/src/main/java/org/autojs/autojs/timing/TimedTask.java
+++ b/app/src/main/java/org/autojs/autojs/timing/TimedTask.java
@@ -53,9 +53,9 @@ public class TimedTask extends BaseModel {
         mMillis = millis;
         mTimeFlag = timeFlag;
         mScriptPath = scriptPath;
-        mDelay = config.delay;
-        mLoopTimes = config.loopTimes;
-        mInterval = config.interval;
+        mDelay = config.getDelay();
+        mLoopTimes = config.getLoopTimes();
+        mInterval = config.getInterval();
     }
 
     public boolean isDisposable() {
diff --git a/app/src/main/java/org/autojs/autojs/timing/TimedTaskManager.java b/app/src/main/java/org/autojs/autojs/timing/TimedTaskManager.java
index f2218244..5f1dada0 100644
--- a/app/src/main/java/org/autojs/autojs/timing/TimedTaskManager.java
+++ b/app/src/main/java/org/autojs/autojs/timing/TimedTaskManager.java
@@ -85,8 +85,8 @@ public class TimedTaskManager {
         mIntentTaskDatabase.insert(intentTask)
                 .subscribe(i -> {
                     if(!TextUtils.isEmpty(intentTask.getAction())){
-                        App.getApp().getDynamicBroadcastReceivers()
-                                .register(intentTask.getAction());
+                        App.Companion.getApp().getDynamicBroadcastReceivers()
+                                .register(intentTask);
                     }
                 }, Throwable::printStackTrace);
     }
@@ -96,7 +96,7 @@ public class TimedTaskManager {
         mIntentTaskDatabase.delete(intentTask)
                 .subscribe(i -> {
                     if(!TextUtils.isEmpty(intentTask.getAction())){
-                        App.getApp().getDynamicBroadcastReceivers()
+                        App.Companion.getApp().getDynamicBroadcastReceivers()
                                 .unregister(intentTask.getAction());
                     }
                 }, Throwable::printStackTrace);
@@ -144,8 +144,8 @@ public class TimedTaskManager {
         mIntentTaskDatabase.update(task)
                 .subscribe(i -> {
                     if(i > 0 && !TextUtils.isEmpty(task.getAction())){
-                        App.getApp().getDynamicBroadcastReceivers()
-                                .register(task.getAction());
+                        App.Companion.getApp().getDynamicBroadcastReceivers()
+                                .register(task);
                     }
                 }, Throwable::printStackTrace);
     }
diff --git a/app/src/main/java/org/autojs/autojs/tool/AccessibilityServiceTool.java b/app/src/main/java/org/autojs/autojs/tool/AccessibilityServiceTool.java
index fb11cf62..f5b20420 100644
--- a/app/src/main/java/org/autojs/autojs/tool/AccessibilityServiceTool.java
+++ b/app/src/main/java/org/autojs/autojs/tool/AccessibilityServiceTool.java
@@ -6,10 +6,10 @@ import android.text.TextUtils;
 
 import com.stardust.app.GlobalAppContext;
 import org.autojs.autojs.Pref;
-import org.autojs.autojs.App;
 import org.autojs.autojs.R;
+
+import com.stardust.autojs.core.accessibility.AccessibilityService;
 import com.stardust.autojs.core.util.ProcessShell;
-import org.autojs.autojs.accessibility.AccessibilityService;
 import com.stardust.view.accessibility.AccessibilityServiceUtils;
 
 import java.util.Locale;
@@ -35,12 +35,12 @@ public class AccessibilityServiceTool {
     public static void goToAccessibilitySetting() {
         Context context = GlobalAppContext.get();
         if (Pref.isFirstGoToAccessibilitySetting()) {
-            GlobalAppContext.toast(context.getString(R.string.text_please_choose) + context.getString(R.string._app_name));
+            GlobalAppContext.toast(context.getString(R.string.text_please_choose) + context.getString(R.string.app_name));
         }
         try {
-            AccessibilityServiceUtils.goToAccessibilitySetting(context);
+            AccessibilityServiceUtils.INSTANCE.goToAccessibilitySetting(context);
         } catch (ActivityNotFoundException e) {
-            GlobalAppContext.toast(context.getString(R.string.go_to_accessibility_settings) + context.getString(R.string._app_name));
+            GlobalAppContext.toast(context.getString(R.string.go_to_accessibility_settings) + context.getString(R.string.app_name));
         }
     }
 
@@ -66,19 +66,19 @@ public class AccessibilityServiceTool {
 
     public static boolean enableAccessibilityServiceByRootAndWaitFor(long timeOut) {
         if (enableAccessibilityServiceByRoot(sAccessibilityServiceClass)) {
-            return AccessibilityService.waitForEnabled(timeOut);
+            return AccessibilityService.Companion.waitForEnabled(timeOut);
         }
         return false;
     }
 
     public static void enableAccessibilityServiceByRootIfNeeded() {
-        if (AccessibilityService.getInstance() == null)
+        if (AccessibilityService.Companion.getInstance() == null)
             if (Pref.shouldEnableAccessibilityServiceByRoot()) {
                 AccessibilityServiceTool.enableAccessibilityServiceByRoot(sAccessibilityServiceClass);
             }
     }
 
     public static boolean isAccessibilityServiceEnabled(Context context) {
-        return AccessibilityServiceUtils.isAccessibilityServiceEnabled(context, sAccessibilityServiceClass);
+        return AccessibilityServiceUtils.INSTANCE.isAccessibilityServiceEnabled(context, sAccessibilityServiceClass);
     }
 }
diff --git a/app/src/main/java/org/autojs/autojs/tool/CrashHandler.java b/app/src/main/java/org/autojs/autojs/tool/CrashHandler.java
index 8a958002..f488b7e0 100644
--- a/app/src/main/java/org/autojs/autojs/tool/CrashHandler.java
+++ b/app/src/main/java/org/autojs/autojs/tool/CrashHandler.java
@@ -47,7 +47,7 @@ public class CrashHandler extends CrashReport.CrashHandleCallback implements Unc
             }
             return;
         }
-        AccessibilityService service = AccessibilityService.getInstance();
+        AccessibilityService service = AccessibilityService.Companion.getInstance();
         if (service != null && Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
             Log.d(TAG, "disable service: " + service);
             service.disableSelf();
diff --git a/app/src/main/java/org/autojs/autojs/tool/RootTool.java b/app/src/main/java/org/autojs/autojs/tool/RootTool.java
index 37aac3b3..f3d05a9d 100644
--- a/app/src/main/java/org/autojs/autojs/tool/RootTool.java
+++ b/app/src/main/java/org/autojs/autojs/tool/RootTool.java
@@ -19,7 +19,6 @@ public class RootTool {
     }
 
     private static final String cmd = "enabled=$(settings get system pointer_location)\n" +
-            "pkg=%s\n" +
             "if [[ $enabled == 1 ]]\n" +
             "then\n" +
             "settings put system pointer_location 0\n" +
diff --git a/app/src/main/java/org/autojs/autojs/tool/SafeJsonElement.java b/app/src/main/java/org/autojs/autojs/tool/SafeJsonElement.java
new file mode 100644
index 00000000..2206aabf
--- /dev/null
+++ b/app/src/main/java/org/autojs/autojs/tool/SafeJsonElement.java
@@ -0,0 +1,136 @@
+package org.autojs.autojs.tool;
+
+import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonNull;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonPrimitive;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+
+public class SafeJsonElement extends JsonElement {
+    private final JsonElement mJsonElement;
+
+    public SafeJsonElement(JsonElement jsonElement) {
+        mJsonElement = jsonElement;
+    }
+
+
+    @Override
+    public JsonElement deepCopy() {
+        return null;
+    }
+
+    @Override
+    public boolean isJsonArray() {
+        return mJsonElement.isJsonArray();
+    }
+
+    @Override
+    public boolean isJsonObject() {
+        return mJsonElement.isJsonObject();
+    }
+
+    @Override
+    public boolean isJsonPrimitive() {
+        return mJsonElement.isJsonPrimitive();
+    }
+
+    @Override
+    public boolean isJsonNull() {
+        return mJsonElement.isJsonNull();
+    }
+
+    public JsonObject getAsJsonObject() {
+        return mJsonElement.getAsJsonObject();
+    }
+
+    public SafeJsonObject getAsSafeJsonObject() {
+        try {
+            return new SafeJsonObject(mJsonElement.getAsJsonObject());
+        } catch (Exception e) {
+            return null;
+        }
+    }
+
+    @Override
+    public JsonArray getAsJsonArray() {
+        return mJsonElement.getAsJsonArray();
+    }
+
+    @Override
+    public JsonPrimitive getAsJsonPrimitive() {
+        return mJsonElement.getAsJsonPrimitive();
+    }
+
+    @Override
+    public JsonNull getAsJsonNull() {
+        return mJsonElement.getAsJsonNull();
+    }
+
+    @Override
+    public boolean getAsBoolean() {
+        return mJsonElement.getAsBoolean();
+    }
+
+    @Override
+    public Number getAsNumber() {
+        return mJsonElement.getAsNumber();
+    }
+
+    @Override
+    public String getAsString() {
+        return mJsonElement.getAsString();
+    }
+
+    @Override
+    public double getAsDouble() {
+        return mJsonElement.getAsDouble();
+    }
+
+    @Override
+    public float getAsFloat() {
+        return mJsonElement.getAsFloat();
+    }
+
+    @Override
+    public long getAsLong() {
+        return mJsonElement.getAsLong();
+    }
+
+    @Override
+    public int getAsInt() {
+        return mJsonElement.getAsInt();
+    }
+
+    @Override
+    public byte getAsByte() {
+        return mJsonElement.getAsByte();
+    }
+
+    @Override
+    public char getAsCharacter() {
+        return mJsonElement.getAsCharacter();
+    }
+
+    @Override
+    public BigDecimal getAsBigDecimal() {
+        return mJsonElement.getAsBigDecimal();
+    }
+
+    @Override
+    public BigInteger getAsBigInteger() {
+        return mJsonElement.getAsBigInteger();
+    }
+
+    @Override
+    public short getAsShort() {
+        return mJsonElement.getAsShort();
+    }
+
+    @Override
+    public String toString() {
+        return mJsonElement.toString();
+    }
+}
diff --git a/app/src/main/java/org/autojs/autojs/tool/SafeJsonObject.java b/app/src/main/java/org/autojs/autojs/tool/SafeJsonObject.java
new file mode 100644
index 00000000..90b55f5c
--- /dev/null
+++ b/app/src/main/java/org/autojs/autojs/tool/SafeJsonObject.java
@@ -0,0 +1,161 @@
+package org.autojs.autojs.tool;
+
+import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonNull;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonPrimitive;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.util.Map;
+import java.util.Set;
+
+public class SafeJsonObject extends JsonElement {
+
+    private final JsonObject mJsonObject;
+
+    public SafeJsonObject(JsonObject jsonObject) {
+        mJsonObject = jsonObject;
+    }
+
+    public JsonObject deepCopy() {
+        return mJsonObject.deepCopy();
+    }
+
+    public void add(String property, JsonElement value) {
+        mJsonObject.add(property, value);
+    }
+
+    public JsonElement remove(String property) {
+        return mJsonObject.remove(property);
+    }
+
+    public void addProperty(String property, String value) {
+        mJsonObject.addProperty(property, value);
+    }
+
+    public void addProperty(String property, Number value) {
+        mJsonObject.addProperty(property, value);
+    }
+
+    public void addProperty(String property, Boolean value) {
+        mJsonObject.addProperty(property, value);
+    }
+
+    public void addProperty(String property, Character value) {
+        mJsonObject.addProperty(property, value);
+    }
+
+    public Set<Map.Entry<String, JsonElement>> entrySet() {
+        return mJsonObject.entrySet();
+    }
+
+    public Set<String> keySet() {
+        return mJsonObject.keySet();
+    }
+
+    public int size() {
+        return mJsonObject.size();
+    }
+
+    public boolean has(String memberName) {
+        return mJsonObject.has(memberName);
+    }
+
+    public JsonElement get(String memberName) {
+        return mJsonObject.get(memberName);
+    }
+
+    public JsonPrimitive getAsJsonPrimitive(String memberName) {
+        return mJsonObject.getAsJsonPrimitive(memberName);
+    }
+
+    public JsonArray getAsJsonArray(String memberName) {
+        return mJsonObject.getAsJsonArray(memberName);
+    }
+
+    public JsonObject getAsJsonObject(String memberName) {
+        return mJsonObject.getAsJsonObject(memberName);
+    }
+
+    public boolean isJsonArray() {
+        return mJsonObject.isJsonArray();
+    }
+
+    public boolean isJsonObject() {
+        return mJsonObject.isJsonObject();
+    }
+
+    public boolean isJsonPrimitive() {
+        return mJsonObject.isJsonPrimitive();
+    }
+
+    public boolean isJsonNull() {
+        return mJsonObject.isJsonNull();
+    }
+
+    public JsonObject getAsJsonObject() {
+        return mJsonObject.getAsJsonObject();
+    }
+
+    public JsonArray getAsJsonArray() {
+        return mJsonObject.getAsJsonArray();
+    }
+
+    public JsonPrimitive getAsJsonPrimitive() {
+        return mJsonObject.getAsJsonPrimitive();
+    }
+
+    public JsonNull getAsJsonNull() {
+        return mJsonObject.getAsJsonNull();
+    }
+
+    public boolean getAsBoolean() {
+        return mJsonObject.getAsBoolean();
+    }
+
+    public Number getAsNumber() {
+        return mJsonObject.getAsNumber();
+    }
+
+    public String getAsString() {
+        return mJsonObject.getAsString();
+    }
+
+    public double getAsDouble() {
+        return mJsonObject.getAsDouble();
+    }
+
+    public float getAsFloat() {
+        return mJsonObject.getAsFloat();
+    }
+
+    public long getAsLong() {
+        return mJsonObject.getAsLong();
+    }
+
+    public int getAsInt() {
+        return mJsonObject.getAsInt();
+    }
+
+    public byte getAsByte() {
+        return mJsonObject.getAsByte();
+    }
+
+    public char getAsCharacter() {
+        return mJsonObject.getAsCharacter();
+    }
+
+    public BigDecimal getAsBigDecimal() {
+        return mJsonObject.getAsBigDecimal();
+    }
+
+    public BigInteger getAsBigInteger() {
+        return mJsonObject.getAsBigInteger();
+    }
+
+    public short getAsShort() {
+        return mJsonObject.getAsShort();
+    }
+}
diff --git a/app/src/main/java/org/autojs/autojs/ui/BaseActivity.java b/app/src/main/java/org/autojs/autojs/ui/BaseActivity.java
index bbc4f9be..746f4aff 100644
--- a/app/src/main/java/org/autojs/autojs/ui/BaseActivity.java
+++ b/app/src/main/java/org/autojs/autojs/ui/BaseActivity.java
@@ -1,21 +1,25 @@
 package org.autojs.autojs.ui;
 
+import android.graphics.PorterDuff;
+import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.annotation.CallSuper;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.RequiresApi;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
+import androidx.annotation.CallSuper;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
+import androidx.core.content.ContextCompat;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatDelegate;
+import androidx.appcompat.widget.Toolbar;
+import android.view.Menu;
 import android.view.View;
-import android.widget.SeekBar;
-
-import org.autojs.autojs.R;
-import org.autojs.autojs.network.VersionService;
 
+import com.stardust.app.GlobalAppContext;
 import com.stardust.theme.ThemeColorManager;
-import com.stardust.util.BackPressedHandler;
+
+import org.autojs.autojs.Pref;
+import org.autojs.autojs.R;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -30,14 +34,33 @@ import static android.content.pm.PackageManager.PERMISSION_GRANTED;
 
 public abstract class BaseActivity extends AppCompatActivity {
 
-
     protected static final int PERMISSION_REQUEST_CODE = 11186;
+    private boolean mShouldApplyDayNightModeForOptionsMenu = true;
 
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
     }
 
+    protected void applyDayNightMode() {
+        GlobalAppContext.post(() -> {
+            if (Pref.isNightModeEnabled()) {
+                setNightModeEnabled(Pref.isNightModeEnabled());
+            }
+        });
+    }
+
+    public void setNightModeEnabled(boolean enabled) {
+        if (enabled) {
+            getDelegate().setLocalNightMode(AppCompatDelegate.MODE_NIGHT_YES);
+        } else {
+            getDelegate().setLocalNightMode(AppCompatDelegate.MODE_NIGHT_NO);
+        }
+        if (getDelegate().applyDayNight()) {
+            recreate();
+        }
+    }
+
     @Override
     protected void onStart() {
         super.onStart();
@@ -85,7 +108,7 @@ public abstract class BaseActivity extends AppCompatActivity {
     }
 
     public static void setToolbarAsBack(final AppCompatActivity activity, int id, String title) {
-        Toolbar toolbar = (Toolbar) activity.findViewById(id);
+        Toolbar toolbar = activity.findViewById(id);
         toolbar.setTitle(title);
         activity.setSupportActionBar(toolbar);
         if (activity.getSupportActionBar() != null) {
@@ -100,4 +123,24 @@ public abstract class BaseActivity extends AppCompatActivity {
         super.onRequestPermissionsResult(requestCode, permissions, grantResults);
     }
 
+    @Override
+    public boolean onPrepareOptionsMenu(Menu menu) {
+        if (mShouldApplyDayNightModeForOptionsMenu && Pref.isNightModeEnabled()) {
+            for (int i = 0; i < menu.size(); i++) {
+                Drawable drawable = menu.getItem(i).getIcon();
+                if (drawable != null) {
+                    drawable.mutate();
+                    drawable.setColorFilter(ContextCompat.getColor(this, R.color.toolbar), PorterDuff.Mode.SRC_ATOP);
+                }
+            }
+            mShouldApplyDayNightModeForOptionsMenu = false;
+        }
+        return super.onPrepareOptionsMenu(menu);
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+
+        return super.onCreateOptionsMenu(menu);
+    }
 }
diff --git a/app/src/main/java/org/autojs/autojs/ui/codegeneration/CodeGenerateDialog.java b/app/src/main/java/org/autojs/autojs/ui/codegeneration/CodeGenerateDialog.java
index ce448544..3287dd16 100644
--- a/app/src/main/java/org/autojs/autojs/ui/codegeneration/CodeGenerateDialog.java
+++ b/app/src/main/java/org/autojs/autojs/ui/codegeneration/CodeGenerateDialog.java
@@ -1,10 +1,10 @@
 package org.autojs.autojs.ui.codegeneration;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.core.view.accessibility.AccessibilityNodeInfoCompat;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/app/src/main/java/org/autojs/autojs/ui/common/FileNameInputDialog.java b/app/src/main/java/org/autojs/autojs/ui/common/FileNameInputDialog.java
new file mode 100644
index 00000000..9cb451ba
--- /dev/null
+++ b/app/src/main/java/org/autojs/autojs/ui/common/FileNameInputDialog.java
@@ -0,0 +1,61 @@
+package org.autojs.autojs.ui.common;
+
+import android.content.Context;
+import androidx.annotation.NonNull;
+import android.text.Editable;
+import android.widget.EditText;
+
+import com.afollestad.materialdialogs.DialogAction;
+import com.afollestad.materialdialogs.MaterialDialog;
+
+import org.autojs.autojs.R;
+
+import java.io.File;
+
+public class FileNameInputDialog implements MaterialDialog.InputCallback {
+
+    private String mExcluded;
+    private boolean mIsFirstTextChanged = true;
+    private String mExtension;
+    private Context mContext;
+    private File mDir;
+
+    private void validateInput(MaterialDialog dialog, String extension) {
+        EditText editText = dialog.getInputEditText();
+        if (editText == null)
+            return;
+        Editable input = editText.getText();
+        int errorResId = 0;
+        if (input == null || input.length() == 0) {
+            dialog.getActionButton(DialogAction.POSITIVE).setEnabled(false);
+            return;
+        }
+        if (new File(mDir, extension == null ? input.toString() : input.toString() + extension).exists()) {
+            errorResId = R.string.text_file_exists;
+        }
+        if (errorResId == 0) {
+            editText.setError(null);
+            dialog.getActionButton(DialogAction.POSITIVE).setEnabled(true);
+        } else {
+            editText.setError(mContext.getString(errorResId));
+            dialog.getActionButton(DialogAction.POSITIVE).setEnabled(false);
+        }
+    }
+
+    @Override
+    public void onInput(@NonNull MaterialDialog dialog, CharSequence input) {
+        if (mIsFirstTextChanged) {
+            mIsFirstTextChanged = false;
+            return;
+        }
+        EditText editText = dialog.getInputEditText();
+        if (editText == null)
+            return;
+        if (input.equals(mExcluded)) {
+            editText.setError(null);
+            dialog.getActionButton(DialogAction.POSITIVE).setEnabled(true);
+            return;
+        }
+        validateInput(dialog, mExtension);
+    }
+}
diff --git a/app/src/main/java/org/autojs/autojs/ui/common/NotAskAgainDialog.java b/app/src/main/java/org/autojs/autojs/ui/common/NotAskAgainDialog.java
index 0526a2c9..5c646858 100644
--- a/app/src/main/java/org/autojs/autojs/ui/common/NotAskAgainDialog.java
+++ b/app/src/main/java/org/autojs/autojs/ui/common/NotAskAgainDialog.java
@@ -2,7 +2,7 @@ package org.autojs.autojs.ui.common;
 
 import android.content.Context;
 import android.preference.PreferenceManager;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.text.TextUtils;
 
 import com.afollestad.materialdialogs.MaterialDialog;
diff --git a/app/src/main/java/org/autojs/autojs/ui/common/OperationDialogBuilder.java b/app/src/main/java/org/autojs/autojs/ui/common/OperationDialogBuilder.java
index f3aaac1d..5f857c7e 100644
--- a/app/src/main/java/org/autojs/autojs/ui/common/OperationDialogBuilder.java
+++ b/app/src/main/java/org/autojs/autojs/ui/common/OperationDialogBuilder.java
@@ -1,9 +1,9 @@
 package com.stardust.app;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -17,7 +17,6 @@ import java.util.ArrayList;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
-import butterknife.OnClick;
 
 /**
  * Created by Stardust on 2017/6/26.
diff --git a/app/src/main/java/org/autojs/autojs/ui/common/OptionListView.java b/app/src/main/java/org/autojs/autojs/ui/common/OptionListView.java
index 17d51b58..8e1414a8 100644
--- a/app/src/main/java/org/autojs/autojs/ui/common/OptionListView.java
+++ b/app/src/main/java/org/autojs/autojs/ui/common/OptionListView.java
@@ -1,9 +1,9 @@
 package org.autojs.autojs.ui.common;
 
 import android.content.Context;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
 import android.view.View;
diff --git a/app/src/main/java/org/autojs/autojs/ui/common/ScriptLoopDialog.java b/app/src/main/java/org/autojs/autojs/ui/common/ScriptLoopDialog.java
index 81f02d34..ecf1a3b0 100644
--- a/app/src/main/java/org/autojs/autojs/ui/common/ScriptLoopDialog.java
+++ b/app/src/main/java/org/autojs/autojs/ui/common/ScriptLoopDialog.java
@@ -1,16 +1,16 @@
 package org.autojs.autojs.ui.common;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.design.widget.TextInputEditText;
+import androidx.annotation.NonNull;
 import android.view.View;
 import android.view.Window;
+import android.widget.EditText;
 
 import com.afollestad.materialdialogs.DialogAction;
 import com.afollestad.materialdialogs.MaterialDialog;
 import com.stardust.app.DialogUtils;
 import com.stardust.app.GlobalAppContext;
-import org.autojs.autojs.App;
+
 import org.autojs.autojs.R;
 import org.autojs.autojs.model.script.ScriptFile;
 import org.autojs.autojs.model.script.Scripts;
@@ -28,13 +28,13 @@ public class ScriptLoopDialog {
     private MaterialDialog mDialog;
 
     @BindView(R.id.loop_times)
-    TextInputEditText mLoopTimes;
+    EditText mLoopTimes;
 
     @BindView(R.id.loop_interval)
-    TextInputEditText mLoopInterval;
+    EditText mLoopInterval;
 
     @BindView(R.id.loop_delay)
-    TextInputEditText mLoopDelay;
+    EditText mLoopDelay;
 
 
     public ScriptLoopDialog(Context context, ScriptFile file) {
@@ -44,12 +44,7 @@ public class ScriptLoopDialog {
                 .title(R.string.text_run_repeatedly)
                 .customView(view, true)
                 .positiveText(R.string.ok)
-                .onPositive(new MaterialDialog.SingleButtonCallback() {
-                    @Override
-                    public void onClick(@NonNull MaterialDialog dialog, @NonNull DialogAction which) {
-                        startScriptRunningLoop();
-                    }
-                })
+                .onPositive((dialog, which) -> startScriptRunningLoop())
                 .build();
         ButterKnife.bind(this, view);
     }
@@ -59,7 +54,7 @@ public class ScriptLoopDialog {
             int loopTimes = Integer.parseInt(mLoopTimes.getText().toString());
             float loopInterval = Float.parseFloat(mLoopInterval.getText().toString());
             float loopDelay = Float.parseFloat(mLoopDelay.getText().toString());
-            Scripts.runRepeatedly(mScriptFile, loopTimes, (long) (1000L * loopDelay), (long) (loopInterval * 1000L));
+            Scripts.INSTANCE.runRepeatedly(mScriptFile, loopTimes, (long) (1000L * loopDelay), (long) (loopInterval * 1000L));
         } catch (NumberFormatException e) {
             GlobalAppContext.toast(R.string.text_number_format_error);
         }
diff --git a/app/src/main/java/org/autojs/autojs/ui/common/ScriptOperations.java b/app/src/main/java/org/autojs/autojs/ui/common/ScriptOperations.java
index 87bc1a40..d695f8b8 100644
--- a/app/src/main/java/org/autojs/autojs/ui/common/ScriptOperations.java
+++ b/app/src/main/java/org/autojs/autojs/ui/common/ScriptOperations.java
@@ -5,13 +5,12 @@ import android.content.Context;
 import android.content.Intent;
 import android.os.Environment;
 import android.os.Looper;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.design.widget.Snackbar;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import com.google.android.material.snackbar.Snackbar;
 import android.text.Editable;
 import android.text.InputType;
 import android.view.View;
-import android.widget.CompoundButton;
 import android.widget.EditText;
 import android.widget.Toast;
 
@@ -19,7 +18,6 @@ import com.afollestad.materialdialogs.DialogAction;
 import com.afollestad.materialdialogs.MaterialDialog;
 import com.stardust.app.DialogUtils;
 import com.stardust.app.GlobalAppContext;
-import com.stardust.pio.PFile;
 import com.stardust.pio.PFiles;
 import com.stardust.pio.UncheckedIOException;
 import com.tencent.bugly.crashreport.BuglyLog;
@@ -30,7 +28,6 @@ import org.autojs.autojs.external.ScriptIntents;
 import org.autojs.autojs.model.explorer.Explorer;
 import org.autojs.autojs.model.explorer.ExplorerDirPage;
 import org.autojs.autojs.model.explorer.ExplorerFileItem;
-import org.autojs.autojs.model.explorer.ExplorerItem;
 import org.autojs.autojs.model.explorer.ExplorerPage;
 import org.autojs.autojs.model.explorer.Explorers;
 import org.autojs.autojs.storage.file.TmpScriptFiles;
@@ -117,7 +114,7 @@ public class ScriptOperations {
             }
             notifyFileCreated(mCurrentDirectory, new ScriptFile(path));
             if (edit)
-                Scripts.edit(path);
+                Scripts.INSTANCE.edit(path);
         } else {
             showMessage(R.string.text_create_fail);
         }
@@ -269,10 +266,8 @@ public class ScriptOperations {
     }
 
     public Observable<ExplorerFileItem> rename(final ExplorerFileItem item) {
-        final ScriptFile oldFile = new ScriptFile(item.getPath());
         String originalName = item.getName();
-        return showNameInputDialog(originalName, new InputCallback(oldFile.isDirectory() ? null : PFiles.getExtension(item.getName()),
-                originalName))
+        return showNameInputDialog(originalName, new InputCallback(null, originalName))
                 .map(newName -> {
                     ExplorerFileItem newItem = item.rename(newName);
                     if (ObjectHelper.equals(newItem.toScriptFile(), item.toScriptFile())) {
@@ -307,18 +302,23 @@ public class ScriptOperations {
 
     @SuppressLint("CheckResult")
     public void deleteWithoutConfirm(final ScriptFile scriptFile) {
+        boolean isDir = scriptFile.isDirectory();
         Observable.fromPublisher((Publisher<Boolean>) s -> s.onNext(PFiles.deleteRecursively(scriptFile)))
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(deleted -> {
                     showMessage(deleted ? R.string.text_already_delete : R.string.text_delete_failed);
                     if (deleted)
-                        notifyFileRemoved(mCurrentDirectory, scriptFile);
+                        notifyFileRemoved(isDir, scriptFile);
                 });
     }
 
-    private void notifyFileRemoved(ScriptFile directory, ScriptFile scriptFile) {
-        mExplorer.notifyItemRemoved(new ExplorerFileItem(scriptFile, mExplorerPage));
+    private void notifyFileRemoved(boolean isDir, ScriptFile scriptFile) {
+        if (isDir) {
+            mExplorer.notifyItemRemoved(new ExplorerDirPage(scriptFile, mExplorerPage));
+        } else {
+            mExplorer.notifyItemRemoved(new ExplorerFileItem(scriptFile, mExplorerPage));
+        }
     }
 
 
@@ -380,7 +380,7 @@ public class ScriptOperations {
         private String mExtension;
 
         InputCallback(@Nullable String ext, String excluded) {
-            mExtension = "." + ext;
+            mExtension = ext == null ? null : "." + ext;
             mExcluded = excluded;
         }
 
@@ -401,7 +401,7 @@ public class ScriptOperations {
             EditText editText = dialog.getInputEditText();
             if (editText == null)
                 return;
-            if (mExcluded != null && input.equals(mExcluded)) {
+            if (input.equals(mExcluded)) {
                 editText.setError(null);
                 dialog.getActionButton(DialogAction.POSITIVE).setEnabled(true);
                 return;
diff --git a/app/src/main/java/org/autojs/autojs/ui/doc/DocsFragment.java b/app/src/main/java/org/autojs/autojs/ui/doc/DocsFragment.java
index 86914a6c..1c57f4d9 100644
--- a/app/src/main/java/org/autojs/autojs/ui/doc/DocsFragment.java
+++ b/app/src/main/java/org/autojs/autojs/ui/doc/DocsFragment.java
@@ -2,9 +2,9 @@ package org.autojs.autojs.ui.doc;
 
 import android.app.Activity;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.design.widget.FloatingActionButton;
-import android.support.v4.widget.SwipeRefreshLayout;
+import androidx.annotation.Nullable;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 import android.text.TextUtils;
 import android.webkit.WebView;
 
diff --git a/app/src/main/java/org/autojs/autojs/ui/edit/ClassSearchDialogBuilder.java b/app/src/main/java/org/autojs/autojs/ui/edit/ClassSearchDialogBuilder.java
index fde3b77d..6d2723ff 100644
--- a/app/src/main/java/org/autojs/autojs/ui/edit/ClassSearchDialogBuilder.java
+++ b/app/src/main/java/org/autojs/autojs/ui/edit/ClassSearchDialogBuilder.java
@@ -3,9 +3,9 @@ package org.autojs.autojs.ui.edit;
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.os.Handler;
-import android.support.annotation.NonNull;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.ContextThemeWrapper;
 import android.view.View;
 import android.widget.EditText;
@@ -18,7 +18,6 @@ import org.autojs.autojs.R;
 import org.autojs.autojs.model.indices.AndroidClassIndices;
 import org.autojs.autojs.model.indices.ClassSearchingItem;
 import org.autojs.autojs.theme.dialog.ThemeColorMaterialDialogBuilder;
-import org.autojs.autojs.tool.MaterialDialogFactory;
 import org.autojs.autojs.ui.widget.AutoAdapter;
 import org.autojs.autojs.ui.widget.BindableViewHolder;
 import org.autojs.autojs.ui.widget.SimpleTextWatcher;
diff --git a/app/src/main/java/org/autojs/autojs/ui/edit/EditActivity.java b/app/src/main/java/org/autojs/autojs/ui/edit/EditActivity.java
index 2ce91f04..f6efb489 100644
--- a/app/src/main/java/org/autojs/autojs/ui/edit/EditActivity.java
+++ b/app/src/main/java/org/autojs/autojs/ui/edit/EditActivity.java
@@ -3,9 +3,10 @@ package org.autojs.autojs.ui.edit;
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.Intent;
+import android.net.Uri;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.util.Log;
 import android.view.ActionMode;
 import android.view.Menu;
@@ -44,8 +45,7 @@ import static org.autojs.autojs.ui.edit.EditorView.EXTRA_READ_ONLY;
  * Created by Stardust on 2017/1/29.
  */
 @EActivity(R.layout.activity_edit)
-public class
-EditActivity extends BaseActivity implements OnActivityResultDelegate.DelegateHost, PermissionRequestProxyActivity {
+public class EditActivity extends BaseActivity implements OnActivityResultDelegate.DelegateHost, PermissionRequestProxyActivity {
 
     private OnActivityResultDelegate.Mediator mMediator = new OnActivityResultDelegate.Mediator();
     private static final String LOG_TAG = "EditActivity";
@@ -61,6 +61,12 @@ EditActivity extends BaseActivity implements OnActivityResultDelegate.DelegateHo
         editFile(context, null, path);
     }
 
+    public static void editFile(Context context, Uri uri) {
+        context.startActivity(new Intent(context, EditActivity_.class)
+                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                .setData(uri));
+    }
+
     public static void editFile(Context context, String name, String path) {
         context.startActivity(new Intent(context, EditActivity_.class)
                 .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
@@ -152,27 +158,27 @@ EditActivity extends BaseActivity implements OnActivityResultDelegate.DelegateHo
     }
 
     @Override
-    public void onSupportActionModeStarted(@NonNull android.support.v7.view.ActionMode mode) {
+    public void onSupportActionModeStarted(@NonNull androidx.appcompat.view.ActionMode mode) {
         Log.d(LOG_TAG, "onSupportActionModeStarted: mode = " + mode);
         super.onSupportActionModeStarted(mode);
     }
 
     @Nullable
     @Override
-    public android.support.v7.view.ActionMode onWindowStartingSupportActionMode(@NonNull android.support.v7.view.ActionMode.Callback callback) {
+    public androidx.appcompat.view.ActionMode onWindowStartingSupportActionMode(@NonNull androidx.appcompat.view.ActionMode.Callback callback) {
         Log.d(LOG_TAG, "onWindowStartingSupportActionMode: callback = " + callback);
         return super.onWindowStartingSupportActionMode(callback);
     }
 
     @Override
     public ActionMode startActionMode(ActionMode.Callback callback, int type) {
-        Log.d(LOG_TAG, "startActionMode: callback = " + callback + ", type = " +  type);
+        Log.d(LOG_TAG, "startActionMode: callback = " + callback + ", type = " + type);
         return super.startActionMode(callback, type);
     }
 
     @Override
     public ActionMode startActionMode(ActionMode.Callback callback) {
-        Log.d(LOG_TAG, "startActionMode: callback = " + callback );
+        Log.d(LOG_TAG, "startActionMode: callback = " + callback);
         return super.startActionMode(callback);
     }
 
diff --git a/app/src/main/java/org/autojs/autojs/ui/edit/EditorMenu.java b/app/src/main/java/org/autojs/autojs/ui/edit/EditorMenu.java
index 2c4eda6b..cf724352 100644
--- a/app/src/main/java/org/autojs/autojs/ui/edit/EditorMenu.java
+++ b/app/src/main/java/org/autojs/autojs/ui/edit/EditorMenu.java
@@ -2,7 +2,7 @@ package org.autojs.autojs.ui.edit;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
-import android.support.design.widget.Snackbar;
+import com.google.android.material.snackbar.Snackbar;
 import android.text.InputType;
 import android.text.TextUtils;
 import android.view.MenuItem;
@@ -190,7 +190,7 @@ public class EditorMenu {
 
     private void startBuildApkActivity() {
         BuildActivity_.intent(mContext)
-                .extra(BuildActivity.EXTRA_SOURCE, mEditorView.getFile().getPath())
+                .extra(BuildActivity.EXTRA_SOURCE, mEditorView.getUri().getPath())
                 .start();
     }
 
diff --git a/app/src/main/java/org/autojs/autojs/ui/edit/EditorView.java b/app/src/main/java/org/autojs/autojs/ui/edit/EditorView.java
index 17401c53..5c522652 100644
--- a/app/src/main/java/org/autojs/autojs/ui/edit/EditorView.java
+++ b/app/src/main/java/org/autojs/autojs/ui/edit/EditorView.java
@@ -7,14 +7,20 @@ import android.content.Context;
 import android.content.ContextWrapper;
 import android.content.Intent;
 import android.content.IntentFilter;
+import android.net.Uri;
 import android.os.Bundle;
 import android.os.Parcelable;
-import android.support.annotation.Nullable;
-import android.support.design.widget.Snackbar;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentActivity;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.widget.DrawerLayout;
+
+import androidx.annotation.Nullable;
+
+import com.google.android.material.snackbar.Snackbar;
+
+import androidx.core.view.GravityCompat;
+import androidx.drawerlayout.widget.DrawerLayout;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
+import androidx.fragment.app.FragmentManager;
+
 import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.util.SparseBooleanArray;
@@ -74,6 +80,9 @@ import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.schedulers.Schedulers;
 
 import static org.autojs.autojs.model.script.Scripts.ACTION_ON_EXECUTION_FINISHED;
+import static org.autojs.autojs.model.script.Scripts.EXTRA_EXCEPTION_COLUMN_NUMBER;
+import static org.autojs.autojs.model.script.Scripts.EXTRA_EXCEPTION_LINE_NUMBER;
+import static org.autojs.autojs.model.script.Scripts.EXTRA_EXCEPTION_MESSAGE;
 
 /**
  * Created by Stardust on 2017/9/28.
@@ -116,7 +125,7 @@ public class EditorView extends FrameLayout implements CodeCompletionBar.OnHintC
     DrawerLayout mDrawerLayout;
 
     private String mName;
-    private File mFile;
+    private Uri mUri;
     private boolean mReadOnly = false;
     private int mScriptExecutionId;
     private AutoCompletion mAutoCompletion;
@@ -131,9 +140,9 @@ public class EditorView extends FrameLayout implements CodeCompletionBar.OnHintC
                     exitDebugging();
                 }
                 setMenuItemStatus(R.id.run, true);
-                String msg = intent.getStringExtra(Scripts.EXTRA_EXCEPTION_MESSAGE);
-                int line = intent.getIntExtra(Scripts.EXTRA_EXCEPTION_LINE_NUMBER, -1);
-                int col = intent.getIntExtra(Scripts.EXTRA_EXCEPTION_COLUMN_NUMBER, 0);
+                String msg = intent.getStringExtra(EXTRA_EXCEPTION_MESSAGE);
+                int line = intent.getIntExtra(EXTRA_EXCEPTION_LINE_NUMBER, -1);
+                int col = intent.getIntExtra(EXTRA_EXCEPTION_COLUMN_NUMBER, 0);
                 if (line >= 1) {
                     mEditor.jumpTo(line - 1, col);
                 }
@@ -179,8 +188,8 @@ public class EditorView extends FrameLayout implements CodeCompletionBar.OnHintC
         }
     }
 
-    public File getFile() {
-        return mFile;
+    public Uri getUri() {
+        return mUri;
     }
 
     public Observable<String> handleIntent(Intent intent) {
@@ -215,21 +224,26 @@ public class EditorView extends FrameLayout implements CodeCompletionBar.OnHintC
             return Observable.just(content);
         } else {
             if (path == null) {
-                return Observable.error(new IllegalArgumentException("path and content is empty"));
+                if (intent.getData() == null) {
+                    return Observable.error(new IllegalArgumentException("path and content is empty"));
+                } else {
+                    mUri = intent.getData();
+                }
+            } else {
+                mUri = Uri.fromFile(new File(path));
             }
-            mFile = new File(path);
             if (mName == null) {
-                mName = mFile.getName();
+                mName = PFiles.getNameWithoutExtension(mUri.getPath());
             }
-            return loadFile(mFile);
+            return loadUri(mUri);
         }
     }
 
 
     @SuppressLint("CheckResult")
-    private Observable<String> loadFile(final File file) {
+    private Observable<String> loadUri(final Uri uri) {
         mEditor.setProgress(true);
-        return Observable.fromCallable(() -> PFiles.read(file))
+        return Observable.fromCallable(() -> PFiles.read(getContext().getContentResolver().openInputStream(uri)))
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .doOnNext(s -> {
@@ -265,7 +279,7 @@ public class EditorView extends FrameLayout implements CodeCompletionBar.OnHintC
 
     @AfterViews
     void init() {
-        setTheme(Theme.getDefault(getContext()));
+        //setTheme(Theme.getDefault(getContext()));
         setUpEditor();
         setUpInputMethodEnhancedBar();
         setUpFunctionsKeyboard();
@@ -342,11 +356,11 @@ public class EditorView extends FrameLayout implements CodeCompletionBar.OnHintC
     }
 
     public boolean onBackPressed() {
-        if (mDrawerLayout.isDrawerOpen(Gravity.START)) {
+        if (mDrawerLayout.isDrawerOpen(GravityCompat.START)) {
             if (mDocsWebView.getWebView().canGoBack()) {
                 mDocsWebView.getWebView().goBack();
             } else {
-                mDrawerLayout.closeDrawer(Gravity.START);
+                mDrawerLayout.closeDrawer(GravityCompat.START);
             }
             return true;
         }
@@ -393,7 +407,8 @@ public class EditorView extends FrameLayout implements CodeCompletionBar.OnHintC
         if (showMessage) {
             Snackbar.make(this, R.string.text_start_running, Snackbar.LENGTH_SHORT).show();
         }
-        ScriptExecution execution = Scripts.runWithBroadcastSender(mFile);
+        // TODO: 2018/10/24
+        ScriptExecution execution = Scripts.INSTANCE.runWithBroadcastSender(new File(mUri.getPath()));
         if (execution == null) {
             return null;
         }
@@ -414,7 +429,7 @@ public class EditorView extends FrameLayout implements CodeCompletionBar.OnHintC
     public Observable<String> save() {
         return Observable.just(mEditor.getText())
                 .observeOn(Schedulers.io())
-                .doOnNext(s -> PFiles.write(mFile, s))
+                .doOnNext(s -> PFiles.write(getContext().getContentResolver().openOutputStream(mUri), s))
                 .observeOn(AndroidSchedulers.mainThread())
                 .doOnNext(s -> {
                     mEditor.markTextAsSaved();
@@ -489,8 +504,9 @@ public class EditorView extends FrameLayout implements CodeCompletionBar.OnHintC
     }
 
     public void openByOtherApps() {
-        if (mFile != null)
-            Scripts.openByOtherApps(mFile);
+        if (mUri != null) {
+            Scripts.INSTANCE.openByOtherApps(mUri);
+        }
     }
 
     public void beautifyCode() {
@@ -616,7 +632,7 @@ public class EditorView extends FrameLayout implements CodeCompletionBar.OnHintC
                 .url(absUrl)
                 .pinToLeft(v -> {
                     mDocsWebView.getWebView().loadUrl(absUrl);
-                    mDrawerLayout.openDrawer(Gravity.START);
+                    mDrawerLayout.openDrawer(GravityCompat.START);
                 })
                 .show();
     }
diff --git a/app/src/main/java/org/autojs/autojs/ui/edit/FindOrReplaceDialogBuilder.java b/app/src/main/java/org/autojs/autojs/ui/edit/FindOrReplaceDialogBuilder.java
index 7da8054c..632d0b6f 100644
--- a/app/src/main/java/org/autojs/autojs/ui/edit/FindOrReplaceDialogBuilder.java
+++ b/app/src/main/java/org/autojs/autojs/ui/edit/FindOrReplaceDialogBuilder.java
@@ -2,7 +2,7 @@ package org.autojs.autojs.ui.edit;
 
 import android.content.Context;
 import android.preference.PreferenceManager;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.text.TextUtils;
 import android.view.View;
 import android.widget.CheckBox;
@@ -25,7 +25,7 @@ import butterknife.OnTextChanged;
 
 public class FindOrReplaceDialogBuilder extends ThemeColorMaterialDialogBuilder {
 
-    private static final String KEY_KEYWORDS = "你回来好不好...";
+    private static final String KEY_KEYWORDS = "...";
 
     @BindView(R.id.checkbox_regex)
     CheckBox mRegexCheckBox;
@@ -50,7 +50,7 @@ public class FindOrReplaceDialogBuilder extends ThemeColorMaterialDialogBuilder
         setupViews();
         restoreState();
         autoDismiss(false);
-        onNegative((dialog, which)-> dialog.dismiss());
+        onNegative((dialog, which) -> dialog.dismiss());
         onPositive((dialog, which) -> {
             storeState();
             findOrReplace(dialog);
diff --git a/app/src/main/java/org/autojs/autojs/ui/edit/TextSizeSettingDialogBuilder.java b/app/src/main/java/org/autojs/autojs/ui/edit/TextSizeSettingDialogBuilder.java
index 9440d5fc..3ffff96a 100644
--- a/app/src/main/java/org/autojs/autojs/ui/edit/TextSizeSettingDialogBuilder.java
+++ b/app/src/main/java/org/autojs/autojs/ui/edit/TextSizeSettingDialogBuilder.java
@@ -1,7 +1,7 @@
 package org.autojs.autojs.ui.edit;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.view.View;
 import android.widget.SeekBar;
 import android.widget.TextView;
diff --git a/app/src/main/java/org/autojs/autojs/ui/edit/ViewSampleActivity.java b/app/src/main/java/org/autojs/autojs/ui/edit/ViewSampleActivity.java
index e553e15c..0cc13051 100644
--- a/app/src/main/java/org/autojs/autojs/ui/edit/ViewSampleActivity.java
+++ b/app/src/main/java/org/autojs/autojs/ui/edit/ViewSampleActivity.java
@@ -5,8 +5,8 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.os.Bundle;
-import android.support.design.widget.Snackbar;
-import android.support.v7.app.AppCompatActivity;
+import com.google.android.material.snackbar.Snackbar;
+import androidx.appcompat.app.AppCompatActivity;
 import android.util.SparseArray;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -21,7 +21,6 @@ import org.autojs.autojs.model.sample.SampleFile;
 import org.autojs.autojs.ui.BaseActivity;
 import org.autojs.autojs.ui.common.ScriptOperations;
 import com.stardust.theme.ThemeColorManager;
-import com.stardust.util.AssetsCache;
 import com.stardust.util.SparseArrayEntries;
 import org.autojs.autojs.ui.widget.ToolbarMenuItem;
 
@@ -71,7 +70,6 @@ public class ViewSampleActivity extends AppCompatActivity implements OnActivityR
         setContentView(mView);
         handleIntent(getIntent());
         setUpUI();
-        setUpEditor();
         registerReceiver(mOnRunFinishedReceiver, new IntentFilter(ACTION_ON_EXECUTION_FINISHED));
     }
 
@@ -86,10 +84,6 @@ public class ViewSampleActivity extends AppCompatActivity implements OnActivityR
         ButterKnife.bind(this);
     }
 
-    private void setUpEditor() {
-
-    }
-
     private void setUpToolbar() {
         BaseActivity.setToolbarAsBack(this, R.id.toolbar, mSample.getSimplifiedName());
     }
diff --git a/app/src/main/java/org/autojs/autojs/ui/edit/completion/CodeCompletionBar.java b/app/src/main/java/org/autojs/autojs/ui/edit/completion/CodeCompletionBar.java
index 65547f61..9553f5e5 100644
--- a/app/src/main/java/org/autojs/autojs/ui/edit/completion/CodeCompletionBar.java
+++ b/app/src/main/java/org/autojs/autojs/ui/edit/completion/CodeCompletionBar.java
@@ -2,8 +2,8 @@ package org.autojs.autojs.ui.edit.completion;
 
 import android.content.Context;
 import android.os.Looper;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.RecyclerView;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
 import android.view.View;
diff --git a/app/src/main/java/org/autojs/autojs/ui/edit/debug/CodeEvaluateDialogBuilder.java b/app/src/main/java/org/autojs/autojs/ui/edit/debug/CodeEvaluateDialogBuilder.java
index 53b82815..7da4da6b 100644
--- a/app/src/main/java/org/autojs/autojs/ui/edit/debug/CodeEvaluateDialogBuilder.java
+++ b/app/src/main/java/org/autojs/autojs/ui/edit/debug/CodeEvaluateDialogBuilder.java
@@ -3,7 +3,7 @@ package org.autojs.autojs.ui.edit.debug;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.preference.PreferenceManager;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.text.Editable;
 import android.text.TextUtils;
 import android.view.View;
diff --git a/app/src/main/java/org/autojs/autojs/ui/edit/debug/DebugBar.java b/app/src/main/java/org/autojs/autojs/ui/edit/debug/DebugBar.java
index 30b667bb..63dd608c 100644
--- a/app/src/main/java/org/autojs/autojs/ui/edit/debug/DebugBar.java
+++ b/app/src/main/java/org/autojs/autojs/ui/edit/debug/DebugBar.java
@@ -1,10 +1,10 @@
 package org.autojs.autojs.ui.edit.debug;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.view.View;
diff --git a/app/src/main/java/org/autojs/autojs/ui/edit/editor/CodeEditText.java b/app/src/main/java/org/autojs/autojs/ui/edit/editor/CodeEditText.java
index 11a2e59e..88f317cc 100644
--- a/app/src/main/java/org/autojs/autojs/ui/edit/editor/CodeEditText.java
+++ b/app/src/main/java/org/autojs/autojs/ui/edit/editor/CodeEditText.java
@@ -25,9 +25,8 @@ import android.graphics.Typeface;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Parcelable;
-import android.service.autofill.AutofillService;
-import android.support.annotation.RequiresApi;
-import android.support.v7.widget.AppCompatEditText;
+import androidx.annotation.RequiresApi;
+import androidx.appcompat.widget.AppCompatEditText;
 import android.text.Editable;
 import android.text.Layout;
 import android.util.AttributeSet;
@@ -35,12 +34,12 @@ import android.util.Log;
 import android.util.TimingLogger;
 import android.view.Gravity;
 import android.view.MotionEvent;
-import android.view.autofill.AutofillManager;
+import android.widget.TextView;
+import android.widget.TextViewHelper;
 
 import org.autojs.autojs.ui.edit.theme.Theme;
 import org.autojs.autojs.ui.edit.theme.TokenMapping;
 
-import com.stardust.util.ClipboardUtil;
 import com.stardust.util.TextUtils;
 
 import org.mozilla.javascript.Token;
@@ -190,14 +189,6 @@ public class CodeEditText extends AppCompatEditText {
         }
     }
 
-    @Override
-    public boolean onTextContextMenuItem(int id) {
-        if (id == android.R.id.paste) {
-            ClipboardUtil.setClip(getContext(), ClipboardUtil.getClip(getContext()).toString());
-        }
-        return super.onTextContextMenuItem(id);
-    }
-
     //该方法中内联了很多函数来提高效率 但是 这是必要的吗？？？
     // 绘制文本着色
     private void drawText(Canvas canvas) {
@@ -450,8 +441,13 @@ public class CodeEditText extends AppCompatEditText {
     @Override
     public Parcelable onSaveInstanceState() {
         Bundle bundle = new Bundle();
-        Parcelable superData = super.onSaveInstanceState();
-        bundle.putParcelable("super_data", superData);
+        Editable text = getText();
+        TextView.SavedState savedState = (SavedState) super.onSaveInstanceState();
+        if (text != null && text.length() > 50 * 1024) {
+            // avoid TransactionTooLargeException
+            TextViewHelper.setText(savedState, "");
+        }
+        bundle.putParcelable("super_data", savedState);
         bundle.putInt("debugging_line", mDebuggingLine);
         int[] breakpoints = new int[mBreakpoints.size()];
         int i = 0;
diff --git a/app/src/main/java/org/autojs/autojs/ui/edit/editor/CodeEditor.java b/app/src/main/java/org/autojs/autojs/ui/edit/editor/CodeEditor.java
index aff768ad..1d56fa3b 100644
--- a/app/src/main/java/org/autojs/autojs/ui/edit/editor/CodeEditor.java
+++ b/app/src/main/java/org/autojs/autojs/ui/edit/editor/CodeEditor.java
@@ -2,7 +2,7 @@ package org.autojs.autojs.ui.edit.editor;
 
 import android.content.Context;
 import android.graphics.Canvas;
-import android.support.design.widget.Snackbar;
+import com.google.android.material.snackbar.Snackbar;
 import android.text.Layout;
 import android.util.AttributeSet;
 import android.widget.Toast;
@@ -85,7 +85,6 @@ public class CodeEditor extends HVScrollView {
         mCodeEditText.addTextChangedListener(new AutoIndent(mCodeEditText));
         mTextViewRedoUndo = new TextViewUndoRedo(mCodeEditText);
         mJavaScriptHighlighter = new JavaScriptHighlighter(mTheme, mCodeEditText);
-        setTheme(Theme.getDefault(getContext()));
         mJsBeautifier = new JsBeautifier(this, "js/js-beautify");
 
     }
diff --git a/app/src/main/java/org/autojs/autojs/ui/edit/editor/JavaScriptHighlighter.java b/app/src/main/java/org/autojs/autojs/ui/edit/editor/JavaScriptHighlighter.java
index 750ce697..c78cd4e2 100644
--- a/app/src/main/java/org/autojs/autojs/ui/edit/editor/JavaScriptHighlighter.java
+++ b/app/src/main/java/org/autojs/autojs/ui/edit/editor/JavaScriptHighlighter.java
@@ -40,7 +40,7 @@ public class JavaScriptHighlighter implements SimpleTextWatcher.AfterTextChanged
         }
 
         public void addToken(int tokenStart, int tokenEnd, int color) {
-            if(mCount < tokenStart){
+            if (mCount < tokenStart) {
                 int c = mCount > 0 ? colors[mCount - 1] : color;
                 for (int i = mCount; i < tokenStart; i++) {
                     colors[i] = c;
@@ -93,7 +93,13 @@ public class JavaScriptHighlighter implements SimpleTextWatcher.AfterTextChanged
     }
 
     public void updateTokens(String sourceString) {
+        if (mTheme == null) {
+            return;
+        }
         final int id = mRunningHighlighterId.incrementAndGet();
+        if (mExecutorService.isShutdown() || mExecutorService.isTerminated() || mExecutorService.isTerminating()) {
+            return;
+        }
         mExecutorService.execute(() -> {
             try {
                 mLogger.reset();
diff --git a/app/src/main/java/org/autojs/autojs/ui/edit/keyboard/FunctionsKeyboardView.java b/app/src/main/java/org/autojs/autojs/ui/edit/keyboard/FunctionsKeyboardView.java
index 466296e2..5b4a2f36 100644
--- a/app/src/main/java/org/autojs/autojs/ui/edit/keyboard/FunctionsKeyboardView.java
+++ b/app/src/main/java/org/autojs/autojs/ui/edit/keyboard/FunctionsKeyboardView.java
@@ -5,14 +5,13 @@ import android.graphics.Paint;
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.RequiresApi;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.widget.DividerItemDecoration;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
+import androidx.core.content.ContextCompat;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
diff --git a/app/src/main/java/org/autojs/autojs/ui/edit/theme/Themes.java b/app/src/main/java/org/autojs/autojs/ui/edit/theme/Themes.java
index 2ae6590d..00888ba2 100644
--- a/app/src/main/java/org/autojs/autojs/ui/edit/theme/Themes.java
+++ b/app/src/main/java/org/autojs/autojs/ui/edit/theme/Themes.java
@@ -12,7 +12,6 @@ import java.util.Collections;
 import java.util.List;
 
 import io.reactivex.Observable;
-import io.reactivex.Single;
 import io.reactivex.schedulers.Schedulers;
 import io.reactivex.subjects.PublishSubject;
 
@@ -25,6 +24,7 @@ public class Themes {
 
     private static final String ASSETS_THEMES_PATH = "editor/theme";
     private static final String DEFAULT_THEME = "Quiet Light";
+    private static final String DARK_THEME = "Dark (Visual Studio)";
 
     private static List<Theme> sThemes;
     private static Theme sDefaultTheme;
@@ -80,7 +80,7 @@ public class Themes {
     }
 
     public static Observable<Theme> getCurrent(Context context) {
-        String currentTheme = Pref.getCurrentTheme();
+        String currentTheme = Pref.isNightModeEnabled() ? DARK_THEME : Pref.getCurrentTheme();
         if (currentTheme == null)
             return getDefault(context);
         return getAllThemes(context)
diff --git a/app/src/main/java/org/autojs/autojs/ui/edit/toolbar/DebugToolbarFragment.java b/app/src/main/java/org/autojs/autojs/ui/edit/toolbar/DebugToolbarFragment.java
index a88ebc25..bafff140 100644
--- a/app/src/main/java/org/autojs/autojs/ui/edit/toolbar/DebugToolbarFragment.java
+++ b/app/src/main/java/org/autojs/autojs/ui/edit/toolbar/DebugToolbarFragment.java
@@ -2,8 +2,8 @@ package org.autojs.autojs.ui.edit.toolbar;
 
 import android.os.Bundle;
 import android.os.Handler;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.RecyclerView;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.View;
@@ -75,7 +75,7 @@ public class DebugToolbarFragment extends ToolbarFragment implements DebugCallba
         mDebugger = DebuggerSingleton.get();
         mDebugger.setWeakDebugCallback(new WeakReference<>(this));
         setInterrupted(false);
-        mCurrentEditorSourceUrl = mInitialEditorSourceUrl = mEditorView.getFile().toString();
+        mCurrentEditorSourceUrl = mInitialEditorSourceUrl = mEditorView.getUri().toString();
         mInitialEditorSource = mEditorView.getEditor().getText();
         setupEditor();
         ScriptExecution execution = mEditorView.run(false);
diff --git a/app/src/main/java/org/autojs/autojs/ui/edit/toolbar/SearchToolbarFragment.java b/app/src/main/java/org/autojs/autojs/ui/edit/toolbar/SearchToolbarFragment.java
index ac947588..9c3a43dd 100644
--- a/app/src/main/java/org/autojs/autojs/ui/edit/toolbar/SearchToolbarFragment.java
+++ b/app/src/main/java/org/autojs/autojs/ui/edit/toolbar/SearchToolbarFragment.java
@@ -1,8 +1,8 @@
 package org.autojs.autojs.ui.edit.toolbar;
 
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
 import android.view.View;
 
 import org.androidannotations.annotations.EFragment;
diff --git a/app/src/main/java/org/autojs/autojs/ui/edit/toolbar/ToolbarFragment.java b/app/src/main/java/org/autojs/autojs/ui/edit/toolbar/ToolbarFragment.java
index c531971f..c9969f0b 100644
--- a/app/src/main/java/org/autojs/autojs/ui/edit/toolbar/ToolbarFragment.java
+++ b/app/src/main/java/org/autojs/autojs/ui/edit/toolbar/ToolbarFragment.java
@@ -1,10 +1,10 @@
 package org.autojs.autojs.ui.edit.toolbar;
 
 import android.os.Bundle;
-import android.os.Parcelable;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
-import android.util.SparseBooleanArray;
+
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+
 import android.view.View;
 
 import org.autojs.autojs.ui.edit.EditorView;
diff --git a/app/src/main/java/org/autojs/autojs/ui/error/AbstractIssueReporterActivity.java b/app/src/main/java/org/autojs/autojs/ui/error/AbstractIssueReporterActivity.java
index 69936c89..e0e9adcd 100644
--- a/app/src/main/java/org/autojs/autojs/ui/error/AbstractIssueReporterActivity.java
+++ b/app/src/main/java/org/autojs/autojs/ui/error/AbstractIssueReporterActivity.java
@@ -3,27 +3,20 @@ package org.autojs.autojs.ui.error;
 import android.app.Activity;
 import android.app.Dialog;
 import android.content.Context;
-import android.content.DialogInterface;
-import android.graphics.Color;
-import android.graphics.PorterDuff;
 import android.graphics.drawable.Drawable;
 import android.os.AsyncTask;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.StringDef;
-import android.support.annotation.StringRes;
-import android.support.design.widget.FloatingActionButton;
-import android.support.design.widget.TextInputEditText;
-import android.support.design.widget.TextInputLayout;
-import android.support.v4.app.NavUtils;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.StringDef;
+import androidx.annotation.StringRes;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+import com.google.android.material.textfield.TextInputLayout;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.widget.Toolbar;
 import android.text.TextUtils;
 import android.util.Log;
-import android.view.KeyEvent;
 import android.view.View;
 import android.view.inputmethod.EditorInfo;
 import android.widget.EditText;
@@ -36,6 +29,7 @@ import android.widget.Toast;
 import com.afollestad.materialdialogs.DialogAction;
 import com.afollestad.materialdialogs.MaterialDialog;
 import com.github.aakira.expandablelayout.ExpandableRelativeLayout;
+import com.heinrichreimersoftware.androidissuereporter.R;
 import com.heinrichreimersoftware.androidissuereporter.model.DeviceInfo;
 import com.heinrichreimersoftware.androidissuereporter.model.Report;
 import com.heinrichreimersoftware.androidissuereporter.model.github.ExtraInfo;
@@ -43,7 +37,10 @@ import com.heinrichreimersoftware.androidissuereporter.model.github.GithubLogin;
 import com.heinrichreimersoftware.androidissuereporter.model.github.GithubTarget;
 import com.heinrichreimersoftware.androidissuereporter.util.ColorUtils;
 import com.heinrichreimersoftware.androidissuereporter.util.ThemeUtils;
+import com.stardust.theme.ThemeColorManager;
 
+import org.autojs.autojs.BuildConfig;
+import org.autojs.autojs.ui.BaseActivity;
 import org.eclipse.egit.github.core.Issue;
 import org.eclipse.egit.github.core.client.GitHubClient;
 import org.eclipse.egit.github.core.client.RequestException;
@@ -56,15 +53,11 @@ import java.lang.ref.WeakReference;
 
 import static android.util.Patterns.EMAIL_ADDRESS;
 
-import com.heinrichreimersoftware.androidissuereporter.R;
-import org.autojs.autojs.BuildConfig;
-import com.stardust.theme.ThemeColorManager;
-
 /**
  * Created by Stardust on 2017/4/3.
  */
 
-public abstract class AbstractIssueReporterActivity extends AppCompatActivity {
+public abstract class AbstractIssueReporterActivity extends BaseActivity {
 
     private static final String TAG = AbstractIssueReporterActivity.class.getSimpleName();
 
@@ -87,15 +80,15 @@ public abstract class AbstractIssueReporterActivity extends AppCompatActivity {
     private boolean emailRequired = false;
     private int bodyMinChar = 0;
     private Toolbar toolbar;
-    private TextInputEditText inputTitle;
-    private TextInputEditText inputDescription;
+    private EditText inputTitle;
+    private EditText inputDescription;
     private TextView textDeviceInfo;
     private ImageButton buttonDeviceInfo;
     private ExpandableRelativeLayout layoutDeviceInfo;
     private ExpandableRelativeLayout layoutAnonymous;
-    private TextInputEditText inputUsername;
-    private TextInputEditText inputPassword;
-    private TextInputEditText inputEmail;
+    private EditText inputUsername;
+    private EditText inputPassword;
+    private EditText inputEmail;
     private RadioButton optionUseAccount;
     private RadioButton optionAnonymous;
     private ExpandableRelativeLayout layoutLogin;
@@ -126,12 +119,7 @@ public abstract class AbstractIssueReporterActivity extends AppCompatActivity {
 
         handleIntent();
 
-        optionAnonymous.post(new Runnable() {
-            @Override
-            public void run() {
-                optionAnonymous.performClick();
-            }
-        });
+        optionAnonymous.post(() -> optionAnonymous.performClick());
     }
 
     private void handleIntent() {
@@ -152,23 +140,23 @@ public abstract class AbstractIssueReporterActivity extends AppCompatActivity {
     }
 
     private void findViews() {
-        toolbar = (Toolbar) findViewById(R.id.air_toolbar);
+        toolbar = findViewById(R.id.air_toolbar);
 
-        inputTitle = (TextInputEditText) findViewById(R.id.air_inputTitle);
-        inputDescription = (TextInputEditText) findViewById(R.id.air_inputDescription);
-        textDeviceInfo = (TextView) findViewById(R.id.air_textDeviceInfo);
-        buttonDeviceInfo = (ImageButton) findViewById(R.id.air_buttonDeviceInfo);
-        layoutDeviceInfo = (ExpandableRelativeLayout) findViewById(R.id.air_layoutDeviceInfo);
+        inputTitle = findViewById(R.id.air_inputTitle);
+        inputDescription = findViewById(R.id.air_inputDescription);
+        textDeviceInfo = findViewById(R.id.air_textDeviceInfo);
+        buttonDeviceInfo = findViewById(R.id.air_buttonDeviceInfo);
+        layoutDeviceInfo = findViewById(R.id.air_layoutDeviceInfo);
 
-        inputUsername = (TextInputEditText) findViewById(R.id.air_inputUsername);
-        inputPassword = (TextInputEditText) findViewById(R.id.air_inputPassword);
-        inputEmail = (TextInputEditText) findViewById(R.id.air_inputEmail);
-        optionUseAccount = (RadioButton) findViewById(R.id.air_optionUseAccount);
-        optionAnonymous = (RadioButton) findViewById(R.id.air_optionAnonymous);
-        layoutLogin = (ExpandableRelativeLayout) findViewById(R.id.air_layoutLogin);
-        layoutAnonymous = (ExpandableRelativeLayout) findViewById(R.id.air_layoutGuest);
+        inputUsername = findViewById(R.id.air_inputUsername);
+        inputPassword = findViewById(R.id.air_inputPassword);
+        inputEmail = findViewById(R.id.air_inputEmail);
+        optionUseAccount = findViewById(R.id.air_optionUseAccount);
+        optionAnonymous = findViewById(R.id.air_optionAnonymous);
+        layoutLogin = findViewById(R.id.air_layoutLogin);
+        layoutAnonymous = findViewById(R.id.air_layoutGuest);
 
-        buttonSend = (FloatingActionButton) findViewById(R.id.air_buttonSend);
+        buttonSend = findViewById(R.id.air_buttonSend);
     }
 
     private void initViews() {
@@ -185,46 +173,30 @@ public abstract class AbstractIssueReporterActivity extends AppCompatActivity {
         toolbar.setBackgroundColor(ThemeColorManager.getColorPrimary());
 
 
-        toolbar.setNavigationOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                finish();
-            }
-        });
+        toolbar.setNavigationOnClickListener(v -> finish());
 
-        buttonDeviceInfo.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                layoutDeviceInfo.toggle();
-            }
-        });
+        buttonDeviceInfo.setOnClickListener(v -> layoutDeviceInfo.toggle());
 
 
-        inputPassword.setOnEditorActionListener(new TextView.OnEditorActionListener() {
-            @Override
-            public boolean onEditorAction(TextView textView, int actionId, KeyEvent event) {
-                if (actionId == EditorInfo.IME_ACTION_SEND) {
-                    reportIssue();
-                    return true;
-                }
-                return false;
+        inputPassword.setOnEditorActionListener((textView, actionId, event) -> {
+            if (actionId == EditorInfo.IME_ACTION_SEND) {
+                reportIssue();
+                return true;
             }
+            return false;
         });
 
         updateGuestTokenViews();
 
         buttonSend.setImageResource(ColorUtils.isDark(ThemeUtils.getColorAccent(this)) ?
                 R.drawable.air_ic_send_dark : R.drawable.air_ic_send_light);
-        buttonSend.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                try {
-                    reportIssue();
-                } catch (Exception e) {
-                    e.printStackTrace();
-                    mReportFailed = true;
-                    finish();
-                }
+        buttonSend.setOnClickListener(v -> {
+            try {
+                reportIssue();
+            } catch (Exception e) {
+                e.printStackTrace();
+                mReportFailed = true;
+                finish();
             }
         });
 
@@ -250,24 +222,18 @@ public abstract class AbstractIssueReporterActivity extends AppCompatActivity {
         } else {
             setOptionUseAccountMarginStart(0);
             optionUseAccount.setEnabled(true);
-            optionUseAccount.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    layoutLogin.expand();
-                    layoutAnonymous.collapse();
-                    inputUsername.setEnabled(true);
-                    inputPassword.setEnabled(true);
-                }
+            optionUseAccount.setOnClickListener(v -> {
+                layoutLogin.expand();
+                layoutAnonymous.collapse();
+                inputUsername.setEnabled(true);
+                inputPassword.setEnabled(true);
             });
             optionAnonymous.setVisibility(View.VISIBLE);
-            optionAnonymous.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    layoutLogin.collapse();
-                    layoutAnonymous.expand();
-                    inputUsername.setEnabled(false);
-                    inputPassword.setEnabled(false);
-                }
+            optionAnonymous.setOnClickListener(v -> {
+                layoutLogin.collapse();
+                layoutAnonymous.expand();
+                inputUsername.setEnabled(false);
+                inputPassword.setEnabled(false);
             });
         }
     }
@@ -347,7 +313,7 @@ public abstract class AbstractIssueReporterActivity extends AppCompatActivity {
         return !hasErrors;
     }
 
-    private void setError(TextInputEditText editText, @StringRes int errorRes) {
+    private void setError(EditText editText, @StringRes int errorRes) {
         try {
             View layout = (View) editText.getParent();
             while (!layout.getClass().getSimpleName().equals(TextInputLayout.class.getSimpleName()))
@@ -359,7 +325,7 @@ public abstract class AbstractIssueReporterActivity extends AppCompatActivity {
         }
     }
 
-    private void setError(TextInputEditText editText, String error) {
+    private void setError(EditText editText, String error) {
         try {
             View layout = (View) editText.getParent();
             while (!layout.getClass().getSimpleName().equals(TextInputLayout.class.getSimpleName()))
@@ -371,7 +337,7 @@ public abstract class AbstractIssueReporterActivity extends AppCompatActivity {
         }
     }
 
-    private void removeError(TextInputEditText editText) {
+    private void removeError(EditText editText) {
         try {
             View layout = (View) editText.getParent();
             while (!layout.getClass().getSimpleName().equals(TextInputLayout.class.getSimpleName()))
@@ -543,19 +509,8 @@ public abstract class AbstractIssueReporterActivity extends AppCompatActivity {
                             .title(R.string.air_dialog_title_failed)
                             .content(R.string.air_dialog_description_failed_unknown)
                             .positiveText(R.string.air_dialog_action_failed)
-                            .onPositive(new MaterialDialog.SingleButtonCallback() {
-                                @Override
-                                public void onClick(@NonNull MaterialDialog dialog,
-                                                    @NonNull DialogAction which) {
-                                    tryToFinishActivity();
-                                }
-                            })
-                            .cancelListener(new DialogInterface.OnCancelListener() {
-                                @Override
-                                public void onCancel(DialogInterface dialog) {
-                                    tryToFinishActivity();
-                                }
-                            })
+                            .onPositive((dialog, which) -> tryToFinishActivity())
+                            .cancelListener(dialog -> tryToFinishActivity())
                             .show();
                     break;
             }
diff --git a/app/src/main/java/org/autojs/autojs/ui/error/ErrorReportActivity.java b/app/src/main/java/org/autojs/autojs/ui/error/ErrorReportActivity.java
index 1c4bc350..829ec800 100644
--- a/app/src/main/java/org/autojs/autojs/ui/error/ErrorReportActivity.java
+++ b/app/src/main/java/org/autojs/autojs/ui/error/ErrorReportActivity.java
@@ -2,15 +2,13 @@ package org.autojs.autojs.ui.error;
 
 import android.content.ClipData;
 import android.content.ClipboardManager;
-import android.content.Intent;
 import android.os.Build;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
-import android.support.annotation.NonNull;
-import android.support.v7.widget.Toolbar;
+import androidx.annotation.NonNull;
+import androidx.appcompat.widget.Toolbar;
 import android.util.Log;
 import android.util.SparseIntArray;
-import android.widget.TextView;
 import android.widget.Toast;
 
 import com.afollestad.materialdialogs.DialogAction;
diff --git a/app/src/main/java/org/autojs/autojs/ui/explorer/ExplorerProjectToolbar.java b/app/src/main/java/org/autojs/autojs/ui/explorer/ExplorerProjectToolbar.java
index 2f01565e..9d3b7357 100644
--- a/app/src/main/java/org/autojs/autojs/ui/explorer/ExplorerProjectToolbar.java
+++ b/app/src/main/java/org/autojs/autojs/ui/explorer/ExplorerProjectToolbar.java
@@ -1,8 +1,8 @@
 package org.autojs.autojs.ui.explorer;
 
 import android.content.Context;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.CardView;
+import androidx.annotation.Nullable;
+import androidx.cardview.widget.CardView;
 import android.util.AttributeSet;
 import android.widget.TextView;
 import android.widget.Toast;
diff --git a/app/src/main/java/org/autojs/autojs/ui/explorer/ExplorerView.java b/app/src/main/java/org/autojs/autojs/ui/explorer/ExplorerView.java
index 20af1c05..9ef8ae67 100644
--- a/app/src/main/java/org/autojs/autojs/ui/explorer/ExplorerView.java
+++ b/app/src/main/java/org/autojs/autojs/ui/explorer/ExplorerView.java
@@ -3,13 +3,15 @@ package org.autojs.autojs.ui.explorer;
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.graphics.drawable.GradientDrawable;
-import android.support.annotation.Nullable;
-import android.support.design.widget.Snackbar;
-import android.support.v4.widget.SwipeRefreshLayout;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.Nullable;
+import com.google.android.material.snackbar.Snackbar;
+import androidx.core.content.ContextCompat;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import android.util.AttributeSet;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -24,6 +26,7 @@ import com.stardust.pio.PFiles;
 import org.autojs.autojs.R;
 import org.autojs.autojs.model.explorer.Explorer;
 import org.autojs.autojs.model.explorer.ExplorerChangeEvent;
+import org.autojs.autojs.model.explorer.ExplorerDirPage;
 import org.autojs.autojs.model.explorer.ExplorerFileItem;
 import org.autojs.autojs.model.explorer.ExplorerItem;
 import org.autojs.autojs.model.explorer.ExplorerPage;
@@ -122,8 +125,8 @@ public class ExplorerView extends ThemeColorSwipeRefreshLayout implements SwipeR
         }
     }
 
-    public void enterChildPage(ExplorerPage childItemGroup) {
-        mCurrentPageState.position = ((LinearLayoutManager) mExplorerItemListView.getLayoutManager()).findFirstVisibleItemPosition();
+    protected void enterDirectChildPage(ExplorerPage childItemGroup) {
+        mCurrentPageState.scrollY = ((LinearLayoutManager) mExplorerItemListView.getLayoutManager()).findLastCompletelyVisibleItemPosition();
         mPageStateHistory.push(mCurrentPageState);
         setCurrentPageState(new ExplorerPageState(childItemGroup));
         loadItemList();
@@ -159,6 +162,28 @@ public class ExplorerView extends ThemeColorSwipeRefreshLayout implements SwipeR
         enterChildPage(currentPage);
     }
 
+    public void enterChildPage(ExplorerPage childPage) {
+        ScriptFile root = mCurrentPageState.page.toScriptFile();
+        ScriptFile dir = childPage.toScriptFile();
+        Stack<ScriptFile> dirs = new Stack<>();
+        while (!dir.equals(root)) {
+            dir = dir.getParentFile();
+            if (dir == null) {
+                break;
+            }
+            dirs.push(dir);
+        }
+        ExplorerDirPage parent = null;
+        while (!dirs.empty()) {
+            dir = dirs.pop();
+            ExplorerDirPage dirPage = new ExplorerDirPage(dir, parent);
+            mPageStateHistory.push(new ExplorerPageState(dirPage));
+            parent = dirPage;
+        }
+        setCurrentPageState(new ExplorerPageState(childPage));
+        loadItemList();
+    }
+
     public void setOnItemOperatedListener(OnItemOperatedListener onItemOperatedListener) {
         mOnItemOperatedListener = onItemOperatedListener;
     }
@@ -186,6 +211,7 @@ public class ExplorerView extends ThemeColorSwipeRefreshLayout implements SwipeR
     }
 
     private void init() {
+        Log.d(LOG_TAG, "item bg = " + Integer.toHexString(ContextCompat.getColor(getContext(), R.color.item_background)));
         setOnRefreshListener(this);
         inflate(getContext(), R.layout.explorer_view, this);
         mExplorerItemListView = findViewById(R.id.explorer_item_list);
@@ -236,16 +262,47 @@ public class ExplorerView extends ThemeColorSwipeRefreshLayout implements SwipeR
                     mExplorerAdapter.notifyDataSetChanged();
                     setRefreshing(false);
                     post(() ->
-                            mExplorerItemListView.scrollToPosition(mCurrentPageState.position)
+                            mExplorerItemListView.scrollToPosition(mCurrentPageState.scrollY)
                     );
                 });
     }
 
     @Subscribe
     public void onExplorerChange(ExplorerChangeEvent event) {
-        if ((event.getAction() == ExplorerChangeEvent.ALL)
-                || mCurrentPageState.page.getPath().equals(event.getPage().getPath())) {
+        Log.d(LOG_TAG, "on explorer change: " + event);
+        if ((event.getAction() == ExplorerChangeEvent.ALL)) {
             loadItemList();
+            return;
+        }
+        String currentDirPath = mCurrentPageState.page.getPath();
+        String changedDirPath = event.getPage().getPath();
+        ExplorerItem item = event.getItem();
+        String changedItemPath = item == null ? null : item.getPath();
+        if (currentDirPath.equals(changedItemPath) || (currentDirPath.equals(changedDirPath) &&
+                event.getAction() == ExplorerChangeEvent.CHILDREN_CHANGE)) {
+            loadItemList();
+            return;
+        }
+        if (currentDirPath.equals(changedDirPath)) {
+            int i;
+            switch (event.getAction()) {
+                case ExplorerChangeEvent.CHANGE:
+                    i = mExplorerItemList.update(item, event.getNewItem());
+                    if (i >= 0) {
+                        mExplorerAdapter.notifyItemChanged(item, i);
+                    }
+                    break;
+                case ExplorerChangeEvent.CREATE:
+                    mExplorerItemList.insertAtFront(event.getNewItem());
+                    mExplorerAdapter.notifyItemInserted(event.getNewItem(), 0);
+                    break;
+                case ExplorerChangeEvent.REMOVE:
+                    i = mExplorerItemList.remove(item);
+                    if (i >= 0) {
+                        mExplorerAdapter.notifyItemRemoved(item, i);
+                    }
+                    break;
+            }
         }
     }
 
@@ -282,11 +339,11 @@ public class ExplorerView extends ThemeColorSwipeRefreshLayout implements SwipeR
                         .createShortcut(mSelectedItem.toScriptFile());
                 break;
             case R.id.open_by_other_apps:
-                Scripts.openByOtherApps(mSelectedItem.toScriptFile());
+                Scripts.INSTANCE.openByOtherApps(mSelectedItem.toScriptFile());
                 notifyOperated();
                 break;
             case R.id.send:
-                Scripts.send(mSelectedItem.toScriptFile());
+                Scripts.INSTANCE.send(mSelectedItem.toScriptFile());
                 notifyOperated();
                 break;
             case R.id.timed_task:
@@ -385,7 +442,7 @@ public class ExplorerView extends ThemeColorSwipeRefreshLayout implements SwipeR
 
         @Override
         public BindableViewHolder<?> onCreateViewHolder(ViewGroup parent, int viewType) {
-            LayoutInflater inflater = LayoutInflater.from(parent.getContext());
+            LayoutInflater inflater = LayoutInflater.from(getContext());
             return ExplorerView.this.onCreateViewHolder(inflater, parent, viewType);
         }
 
@@ -417,6 +474,25 @@ public class ExplorerView extends ThemeColorSwipeRefreshLayout implements SwipeR
             }
         }
 
+        int getItemPosition(ExplorerItem item, int i) {
+            if (item instanceof ExplorerPage) {
+                return i + positionOfCategoryDir + 1;
+            }
+            return i + positionOfCategoryFile() + 1;
+        }
+
+        public void notifyItemChanged(ExplorerItem item, int i) {
+            notifyItemChanged(getItemPosition(item, i));
+        }
+
+        public void notifyItemRemoved(ExplorerItem item, int i) {
+            notifyItemRemoved(getItemPosition(item, i));
+        }
+
+        public void notifyItemInserted(ExplorerItem item, int i) {
+            notifyItemInserted(getItemPosition(item, i));
+        }
+
         @Override
         public int getItemCount() {
             int count = 0;
@@ -475,13 +551,13 @@ public class ExplorerView extends ThemeColorSwipeRefreshLayout implements SwipeR
 
         @OnClick(R.id.run)
         void run() {
-            Scripts.run(new ScriptFile(mExplorerItem.getPath()));
+            Scripts.INSTANCE.run(new ScriptFile(mExplorerItem.getPath()));
             notifyOperated();
         }
 
         @OnClick(R.id.edit)
         void edit() {
-            Scripts.edit(new ScriptFile(mExplorerItem.getPath()));
+            Scripts.INSTANCE.edit(new ScriptFile(mExplorerItem.getPath()));
             notifyOperated();
         }
 
@@ -538,7 +614,7 @@ public class ExplorerView extends ThemeColorSwipeRefreshLayout implements SwipeR
 
         @OnClick(R.id.item)
         void onItemClick() {
-            enterChildPage(mExplorerPage);
+            enterDirectChildPage(mExplorerPage);
         }
 
         @OnClick(R.id.more)
@@ -646,7 +722,7 @@ public class ExplorerView extends ThemeColorSwipeRefreshLayout implements SwipeR
 
         boolean filesCollapsed;
 
-        int position;
+        int scrollY;
 
         ExplorerPageState() {
         }
diff --git a/app/src/main/java/org/autojs/autojs/ui/explorer/ExplorerViewHelper.java b/app/src/main/java/org/autojs/autojs/ui/explorer/ExplorerViewHelper.java
index c1719b0b..a4d05fbe 100644
--- a/app/src/main/java/org/autojs/autojs/ui/explorer/ExplorerViewHelper.java
+++ b/app/src/main/java/org/autojs/autojs/ui/explorer/ExplorerViewHelper.java
@@ -12,7 +12,7 @@ import org.autojs.autojs.model.explorer.ExplorerPage;
 import org.autojs.autojs.model.explorer.ExplorerProjectPage;
 import org.autojs.autojs.model.explorer.ExplorerSamplePage;
 
-import static android.support.v4.content.ContextCompat.getColor;
+import static androidx.core.content.ContextCompat.getColor;
 import static org.autojs.autojs.model.explorer.ExplorerItem.TYPE_AUTO_FILE;
 import static org.autojs.autojs.model.explorer.ExplorerItem.TYPE_JAVASCRIPT;
 import static org.autojs.autojs.model.explorer.ExplorerItem.TYPE_UNKNOWN;
diff --git a/app/src/main/java/org/autojs/autojs/ui/filechooser/FileChooseListView.java b/app/src/main/java/org/autojs/autojs/ui/filechooser/FileChooseListView.java
index 47f1d69d..4606c115 100644
--- a/app/src/main/java/org/autojs/autojs/ui/filechooser/FileChooseListView.java
+++ b/app/src/main/java/org/autojs/autojs/ui/filechooser/FileChooseListView.java
@@ -2,8 +2,7 @@ package org.autojs.autojs.ui.filechooser;
 
 import android.content.Context;
 import android.graphics.drawable.GradientDrawable;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.SimpleItemAnimator;
+import androidx.annotation.Nullable;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -28,6 +27,7 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
+import androidx.recyclerview.widget.SimpleItemAnimator;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnCheckedChanged;
@@ -174,7 +174,7 @@ public class FileChooseListView extends ExplorerView {
 
         @OnClick(R.id.item)
         void onItemClick() {
-            enterChildPage(mExplorerPage);
+            enterDirectChildPage(mExplorerPage);
         }
 
         @OnCheckedChanged(R.id.checkbox)
diff --git a/app/src/main/java/org/autojs/autojs/ui/filechooser/FileChooserDialogBuilder.java b/app/src/main/java/org/autojs/autojs/ui/filechooser/FileChooserDialogBuilder.java
index 9ed471b3..a7652ffd 100644
--- a/app/src/main/java/org/autojs/autojs/ui/filechooser/FileChooserDialogBuilder.java
+++ b/app/src/main/java/org/autojs/autojs/ui/filechooser/FileChooserDialogBuilder.java
@@ -1,8 +1,8 @@
 package org.autojs.autojs.ui.filechooser;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.annotation.StringRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.StringRes;
 
 import com.afollestad.materialdialogs.MaterialDialog;
 import com.stardust.pio.PFile;
@@ -75,7 +75,7 @@ public class FileChooserDialogBuilder extends ThemeColorMaterialDialogBuilder {
     }
 
     public FileChooserDialogBuilder justScriptFile() {
-        mFileFilter = Scripts.FILE_FILTER;
+        mFileFilter = Scripts.INSTANCE.getFILE_FILTER();
         return this;
     }
 
diff --git a/app/src/main/java/org/autojs/autojs/ui/floating/CircularActionMenu.java b/app/src/main/java/org/autojs/autojs/ui/floating/CircularActionMenu.java
index 0128bad5..0ce1db60 100644
--- a/app/src/main/java/org/autojs/autojs/ui/floating/CircularActionMenu.java
+++ b/app/src/main/java/org/autojs/autojs/ui/floating/CircularActionMenu.java
@@ -5,12 +5,11 @@ import android.animation.AnimatorListenerAdapter;
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.graphics.PointF;
-import android.support.annotation.AttrRes;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.view.animation.FastOutSlowInInterpolator;
+import androidx.annotation.AttrRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.interpolator.view.animation.FastOutSlowInInterpolator;
 import android.util.AttributeSet;
-import android.util.TypedValue;
 import android.view.Gravity;
 import android.view.View;
 import android.view.animation.Animation;
diff --git a/app/src/main/java/org/autojs/autojs/ui/floating/CircularMenu.java b/app/src/main/java/org/autojs/autojs/ui/floating/CircularMenu.java
index 4fadb0a2..e79e9e98 100644
--- a/app/src/main/java/org/autojs/autojs/ui/floating/CircularMenu.java
+++ b/app/src/main/java/org/autojs/autojs/ui/floating/CircularMenu.java
@@ -17,7 +17,6 @@ import com.stardust.enhancedfloaty.FloatyWindow;
 
 import org.autojs.autojs.Pref;
 import org.autojs.autojs.R;
-import org.autojs.autojs.accessibility.AccessibilityService;
 import org.autojs.autojs.autojs.AutoJs;
 import org.autojs.autojs.autojs.record.GlobalActionRecorder;
 import org.autojs.autojs.model.explorer.ExplorerDirPage;
@@ -31,8 +30,10 @@ import org.autojs.autojs.ui.floating.layoutinspector.LayoutHierarchyFloatyWindow
 import org.autojs.autojs.ui.main.MainActivity_;
 import org.autojs.autojs.ui.explorer.ExplorerView;
 import org.autojs.autojs.theme.dialog.ThemeColorMaterialDialogBuilder;
+
 import com.stardust.util.ClipboardUtil;
 import com.stardust.util.Func1;
+import com.stardust.view.accessibility.AccessibilityService;
 import com.stardust.view.accessibility.LayoutInspector;
 import com.stardust.view.accessibility.NodeInfo;
 
@@ -143,8 +144,9 @@ public class CircularMenu implements Recorder.OnStateChangedListener, LayoutInsp
                 .positiveText(R.string.cancel)
                 .build();
         explorerView.setOnItemOperatedListener(file -> dialog.dismiss());
-        explorerView.setOnItemClickListener((view, item) -> Scripts.run(item.toScriptFile()));
+        explorerView.setOnItemClickListener((view, item) -> Scripts.INSTANCE.run(item.toScriptFile()));
         DialogUtils.showDialog(dialog);
+
     }
 
     @Optional
@@ -213,9 +215,11 @@ public class CircularMenu implements Recorder.OnStateChangedListener, LayoutInsp
     }
 
     private void inspectLayout(Func1<NodeInfo, FloatyWindow> windowCreator) {
-        mLayoutInspectDialog.dismiss();
-        mLayoutInspectDialog = null;
-        if (AccessibilityService.getInstance() == null) {
+        if (mLayoutInspectDialog != null) {
+            mLayoutInspectDialog.dismiss();
+            mLayoutInspectDialog = null;
+        }
+        if (AccessibilityService.Companion.getInstance() == null) {
             Toast.makeText(mContext, R.string.text_no_accessibility_permission_to_capture, Toast.LENGTH_SHORT).show();
             AccessibilityServiceTool.goToAccessibilitySetting();
             return;
@@ -257,7 +261,7 @@ public class CircularMenu implements Recorder.OnStateChangedListener, LayoutInsp
     @OnClick(R.id.settings)
     void settings() {
         mWindow.collapse();
-        mRunningPackage = AutoJs.getInstance().getInfoProvider().getLatestPackage();
+        mRunningPackage = AutoJs.getInstance().getInfoProvider().getLatestPackageByUsageStatsIfGranted();
         mRunningActivity = AutoJs.getInstance().getInfoProvider().getLatestActivity();
         mSettingsDialog = new OperationDialogBuilder(mContext)
                 .item(R.id.accessibility_service, R.drawable.ic_service_green, R.string.text_accessibility_settings)
diff --git a/app/src/main/java/org/autojs/autojs/ui/floating/gesture/DragGesture.java b/app/src/main/java/org/autojs/autojs/ui/floating/gesture/DragGesture.java
index 144e755d..f128ff74 100644
--- a/app/src/main/java/org/autojs/autojs/ui/floating/gesture/DragGesture.java
+++ b/app/src/main/java/org/autojs/autojs/ui/floating/gesture/DragGesture.java
@@ -1,6 +1,6 @@
 package org.autojs.autojs.ui.floating.gesture;
 
-import android.support.v4.view.GestureDetectorCompat;
+import androidx.core.view.GestureDetectorCompat;
 import android.util.Log;
 import android.view.GestureDetector;
 import android.view.MotionEvent;
diff --git a/app/src/main/java/org/autojs/autojs/ui/floating/layoutinspector/LayoutBoundsFloatyWindow.java b/app/src/main/java/org/autojs/autojs/ui/floating/layoutinspector/LayoutBoundsFloatyWindow.java
index d69bce4f..c0d36ee4 100644
--- a/app/src/main/java/org/autojs/autojs/ui/floating/layoutinspector/LayoutBoundsFloatyWindow.java
+++ b/app/src/main/java/org/autojs/autojs/ui/floating/layoutinspector/LayoutBoundsFloatyWindow.java
@@ -5,7 +5,6 @@ import android.view.ContextThemeWrapper;
 import android.view.KeyEvent;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.WindowManager;
 
 import com.afollestad.materialdialogs.MaterialDialog;
 import com.afollestad.materialdialogs.Theme;
diff --git a/app/src/main/java/org/autojs/autojs/ui/floating/layoutinspector/LayoutBoundsView.java b/app/src/main/java/org/autojs/autojs/ui/floating/layoutinspector/LayoutBoundsView.java
index ee9f547b..3d3e247e 100644
--- a/app/src/main/java/org/autojs/autojs/ui/floating/layoutinspector/LayoutBoundsView.java
+++ b/app/src/main/java/org/autojs/autojs/ui/floating/layoutinspector/LayoutBoundsView.java
@@ -7,8 +7,8 @@ import android.graphics.Paint;
 import android.graphics.Rect;
 import android.graphics.Region;
 import android.os.Build;
-import android.support.annotation.Nullable;
-import android.support.annotation.RequiresApi;
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
 import android.util.AttributeSet;
 import android.view.MotionEvent;
 import android.view.View;
@@ -18,7 +18,6 @@ import com.stardust.util.ViewUtil;
 
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.Comparator;
 import java.util.List;
 
 /**
diff --git a/app/src/main/java/org/autojs/autojs/ui/floating/layoutinspector/LayoutHierarchyFloatyWindow.java b/app/src/main/java/org/autojs/autojs/ui/floating/layoutinspector/LayoutHierarchyFloatyWindow.java
index 18813913..54fc4be2 100644
--- a/app/src/main/java/org/autojs/autojs/ui/floating/layoutinspector/LayoutHierarchyFloatyWindow.java
+++ b/app/src/main/java/org/autojs/autojs/ui/floating/layoutinspector/LayoutHierarchyFloatyWindow.java
@@ -1,24 +1,20 @@
 package org.autojs.autojs.ui.floating.layoutinspector;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
 import android.view.ContextThemeWrapper;
 import android.view.KeyEvent;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.WindowManager;
 
 import com.afollestad.materialdialogs.MaterialDialog;
 import com.afollestad.materialdialogs.Theme;
 import com.stardust.app.DialogUtils;
-import com.stardust.app.GlobalAppContext;
 import com.stardust.enhancedfloaty.FloatyService;
 import org.autojs.autojs.R;
 import org.autojs.autojs.ui.codegeneration.CodeGenerateDialog;
 import org.autojs.autojs.ui.floating.FloatyWindowManger;
 import org.autojs.autojs.ui.floating.FullScreenFloatyWindow;
 
-import com.stardust.view.accessibility.LayoutInspector;
 import com.stardust.view.accessibility.NodeInfo;
 import org.autojs.autojs.ui.widget.BubblePopupMenu;
 
diff --git a/app/src/main/java/org/autojs/autojs/ui/floating/layoutinspector/LayoutHierarchyView.java b/app/src/main/java/org/autojs/autojs/ui/floating/layoutinspector/LayoutHierarchyView.java
index 24d3523d..385605d6 100644
--- a/app/src/main/java/org/autojs/autojs/ui/floating/layoutinspector/LayoutHierarchyView.java
+++ b/app/src/main/java/org/autojs/autojs/ui/floating/layoutinspector/LayoutHierarchyView.java
@@ -232,7 +232,7 @@ public class LayoutHierarchyView extends MultiLevelListView {
                 viewHolder = (ViewHolder) convertView.getTag();
             }
 
-            viewHolder.nameView.setText(simplifyClassName(nodeInfo.className));
+            viewHolder.nameView.setText(simplifyClassName(nodeInfo.getClassName()));
             viewHolder.nodeInfo = nodeInfo;
             if (viewHolder.infoView.getVisibility() == VISIBLE)
                 viewHolder.infoView.setText(getItemInfoDsc(itemInfo));
diff --git a/app/src/main/java/org/autojs/autojs/ui/floating/layoutinspector/NodeInfoView.java b/app/src/main/java/org/autojs/autojs/ui/floating/layoutinspector/NodeInfoView.java
deleted file mode 100644
index eb46ff02..00000000
--- a/app/src/main/java/org/autojs/autojs/ui/floating/layoutinspector/NodeInfoView.java
+++ /dev/null
@@ -1,176 +0,0 @@
-package org.autojs.autojs.ui.floating.layoutinspector;
-
-import android.content.Context;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.util.AttributeSet;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import org.autojs.autojs.R;
-import com.stardust.view.accessibility.NodeInfo;
-import com.stardust.util.ClipboardUtil;
-import com.yqritc.recyclerviewflexibledivider.HorizontalDividerItemDecoration;
-
-import java.lang.reflect.Field;
-import java.util.Arrays;
-
-import butterknife.BindView;
-import butterknife.ButterKnife;
-import butterknife.OnClick;
-import butterknife.Optional;
-
-/**
- * Created by Stardust on 2017/3/10.
- */
-
-public class NodeInfoView extends RecyclerView {
-
-    private static final String[] FIELD_NAMES = {
-            "id",
-            "bounds",
-            "depth",
-            "desc",
-            "className",
-            "packageName",
-            "text",
-            "drawingOrder",
-            "accessibilityFocused",
-            "checked",
-            "clickable",
-            "contextClickable",
-            "dismissable",
-            "editable",
-            "enabled",
-            "focusable",
-            "indexInParent",
-            "longClickable",
-            "row",
-            "rowCount",
-            "rowSpan",
-            "column",
-            "columnCount",
-            "columnSpan",
-            "selected",
-            "scrollable",
-    };
-    private static final Field[] FIELDS = new Field[FIELD_NAMES.length];
-
-    static {
-        Arrays.sort(FIELD_NAMES);
-        for (int i = 0; i < FIELD_NAMES.length; i++) {
-            try {
-                FIELDS[i] = NodeInfo.class.getDeclaredField(FIELD_NAMES[i]);
-            } catch (NoSuchFieldException e) {
-                throw new RuntimeException(e);
-            }
-        }
-    }
-
-    private String[][] mData = new String[FIELDS.length + 1][2];
-
-    public NodeInfoView(Context context) {
-        super(context);
-        init();
-    }
-
-    public NodeInfoView(Context context, @Nullable AttributeSet attrs) {
-        super(context, attrs);
-        init();
-    }
-
-    public NodeInfoView(Context context, @Nullable AttributeSet attrs, int defStyle) {
-        super(context, attrs, defStyle);
-        init();
-    }
-
-    public void setNodeInfo(NodeInfo nodeInfo) {
-        for (int i = 0; i < FIELDS.length; i++) {
-            try {
-                Object value = FIELDS[i].get(nodeInfo);
-                mData[i + 1][1] = value == null ? "" : value.toString();
-            } catch (Exception e) {
-                throw new RuntimeException(e);
-            }
-        }
-        getAdapter().notifyDataSetChanged();
-    }
-
-    private void init() {
-        initData();
-        setAdapter(new Adapter());
-        setLayoutManager(new LinearLayoutManager(getContext()));
-        addItemDecoration(new HorizontalDividerItemDecoration.Builder(getContext())
-                .color(0x1e000000)
-                .size(2)
-                .build());
-    }
-
-    private void initData() {
-        mData[0][0] = getResources().getString(R.string.text_attribute);
-        mData[0][1] = getResources().getString(R.string.text_value);
-        for (int i = 1; i < mData.length; i++) {
-            mData[i][0] = FIELD_NAMES[i - 1];
-            mData[i][1] = "";
-        }
-    }
-
-    private class Adapter extends RecyclerView.Adapter<ViewHolder> {
-
-        final int VIEW_TYPE_HEADER = 0;
-        final int VIEW_TYPE_ITEM = 1;
-
-
-        @Override
-        public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
-            int layoutRes = viewType == VIEW_TYPE_HEADER ? R.layout.node_info_view_header : R.layout.node_info_view_item;
-            return new ViewHolder(LayoutInflater.from(parent.getContext()).inflate(layoutRes, parent, false));
-        }
-
-        @Override
-        public void onBindViewHolder(ViewHolder holder, int position) {
-            holder.attrName.setText(mData[position][0]);
-            holder.attrValue.setText(mData[position][1]);
-        }
-
-        @Override
-        public int getItemCount() {
-            return mData.length;
-        }
-
-        @Override
-        public int getItemViewType(int position) {
-            return position == 0 ? VIEW_TYPE_HEADER : VIEW_TYPE_ITEM;
-        }
-    }
-
-    class ViewHolder extends RecyclerView.ViewHolder {
-
-
-        @BindView(R.id.name)
-        TextView attrName;
-
-        @BindView(R.id.value)
-        TextView attrValue;
-
-        public ViewHolder(View itemView) {
-            super(itemView);
-            ButterKnife.bind(this, itemView);
-        }
-
-        @Optional
-        @OnClick(R.id.item)
-        void onItemClick() {
-            int pos = getAdapterPosition();
-            if (pos < 1 || pos >= mData.length)
-                return;
-            ClipboardUtil.setClip(getContext(), mData[pos][0] + " = " + mData[pos][1]);
-            Toast.makeText(getContext(), R.string.text_already_copy_to_clip, Toast.LENGTH_SHORT).show();
-        }
-    }
-
-}
\ No newline at end of file
diff --git a/app/src/main/java/org/autojs/autojs/ui/floating/layoutinspector/NodeInfoView.kt b/app/src/main/java/org/autojs/autojs/ui/floating/layoutinspector/NodeInfoView.kt
new file mode 100644
index 00000000..54835071
--- /dev/null
+++ b/app/src/main/java/org/autojs/autojs/ui/floating/layoutinspector/NodeInfoView.kt
@@ -0,0 +1,154 @@
+package org.autojs.autojs.ui.floating.layoutinspector
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.TextView
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import butterknife.BindView
+import com.google.android.material.snackbar.Snackbar
+import com.stardust.util.ClipboardUtil
+import com.stardust.util.sortedArrayOf
+import com.stardust.view.accessibility.NodeInfo
+import com.yqritc.recyclerviewflexibledivider.HorizontalDividerItemDecoration
+import org.autojs.autojs.R
+import java.lang.reflect.Field
+
+/**
+ * Created by Stardust on 2017/3/10.
+ */
+
+class NodeInfoView : RecyclerView {
+
+    private val mData = Array(FIELDS.size + 1) { Array(2) { "" } }
+
+    constructor(context: Context) : super(context) {
+        init()
+    }
+
+    constructor(context: Context, attrs: AttributeSet?) : super(context, attrs) {
+        init()
+    }
+
+    constructor(context: Context, attrs: AttributeSet?, defStyle: Int) : super(context, attrs, defStyle) {
+        init()
+    }
+
+    fun setNodeInfo(nodeInfo: NodeInfo) {
+        for (i in FIELDS.indices) {
+            try {
+                val value = FIELDS[i].get(nodeInfo)
+                mData[i + 1][1] = value?.toString() ?: ""
+            } catch (e: Exception) {
+                throw RuntimeException(e)
+            }
+
+        }
+        adapter!!.notifyDataSetChanged()
+    }
+
+    private fun init() {
+        initData()
+        adapter = Adapter()
+        layoutManager = LinearLayoutManager(context)
+        addItemDecoration(HorizontalDividerItemDecoration.Builder(context)
+                .color(0x1e000000)
+                .size(2)
+                .build())
+    }
+
+    private fun initData() {
+        mData[0][0] = resources.getString(R.string.text_attribute)
+        mData[0][1] = resources.getString(R.string.text_value)
+        for (i in 1 until mData.size) {
+            mData[i][0] = FIELD_NAMES[i - 1]
+            mData[i][1] = ""
+        }
+    }
+
+    private inner class Adapter : RecyclerView.Adapter<ViewHolder>() {
+
+        internal val VIEW_TYPE_HEADER = 0
+        internal val VIEW_TYPE_ITEM = 1
+
+
+        override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
+            val layoutRes = if (viewType == VIEW_TYPE_HEADER) R.layout.node_info_view_header else R.layout.node_info_view_item
+            return ViewHolder(LayoutInflater.from(parent.context).inflate(layoutRes, parent, false))
+        }
+
+        override fun onBindViewHolder(holder: ViewHolder, position: Int) {
+            holder.attrName.text = mData[position][0]
+            holder.attrValue.text = mData[position][1]
+        }
+
+        override fun getItemCount(): Int {
+            return mData.size
+        }
+
+        override fun getItemViewType(position: Int): Int {
+            return if (position == 0) VIEW_TYPE_HEADER else VIEW_TYPE_ITEM
+        }
+    }
+
+    internal inner class ViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
+
+        @BindView(R.id.name)
+        val attrName: TextView = itemView.findViewById(R.id.name)
+
+        val attrValue: TextView = itemView.findViewById(R.id.value)
+
+        init {
+            itemView.setOnClickListener {
+                val pos = adapterPosition
+                if (pos < 1 || pos >= mData.size)
+                    return@setOnClickListener
+                ClipboardUtil.setClip(context, mData[pos][0] + " = " + mData[pos][1])
+                Snackbar.make(this@NodeInfoView, R.string.text_already_copy_to_clip, Snackbar.LENGTH_SHORT).show()
+            }
+        }
+
+    }
+
+    companion object {
+
+        private val FIELD_NAMES = sortedArrayOf(
+                "id",
+                "idHex",
+                "fullId",
+                "bounds",
+                "depth",
+                "desc",
+                "className",
+                "packageName",
+                "text",
+                "drawingOrder",
+                "accessibilityFocused",
+                "checked",
+                "clickable",
+                "contextClickable",
+                "dismissable",
+                "editable",
+                "enabled",
+                "focusable",
+                "indexInParent",
+                "longClickable",
+                "row",
+                "rowCount",
+                "rowSpan",
+                "column",
+                "columnCount",
+                "columnSpan",
+                "selected",
+                "scrollable")
+        private val FIELDS = Array<Field>(FIELD_NAMES.size) {
+            val field = NodeInfo::class.java.getDeclaredField(FIELD_NAMES[it])
+            field.isAccessible = true
+            field
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/autojs/autojs/ui/log/LogActivity.java b/app/src/main/java/org/autojs/autojs/ui/log/LogActivity.java
index 26257c11..c022b8a7 100644
--- a/app/src/main/java/org/autojs/autojs/ui/log/LogActivity.java
+++ b/app/src/main/java/org/autojs/autojs/ui/log/LogActivity.java
@@ -1,22 +1,19 @@
 package org.autojs.autojs.ui.log;
 
 import android.os.Bundle;
-import android.support.design.widget.FloatingActionButton;
-import android.support.design.widget.Snackbar;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
+import androidx.annotation.Nullable;
 import android.view.View;
 
 import com.stardust.autojs.core.console.ConsoleView;
-import com.stardust.autojs.core.console.StardustConsole;
-import org.autojs.autojs.R;
-import org.autojs.autojs.autojs.AutoJs;
-import org.autojs.autojs.ui.BaseActivity;
+import com.stardust.autojs.core.console.ConsoleImpl;
 
 import org.androidannotations.annotations.AfterViews;
 import org.androidannotations.annotations.Click;
 import org.androidannotations.annotations.EActivity;
 import org.androidannotations.annotations.ViewById;
+import org.autojs.autojs.R;
+import org.autojs.autojs.autojs.AutoJs;
+import org.autojs.autojs.ui.BaseActivity;
 
 @EActivity(R.layout.activity_log)
 public class LogActivity extends BaseActivity {
@@ -24,18 +21,24 @@ public class LogActivity extends BaseActivity {
     @ViewById(R.id.console)
     ConsoleView mConsoleView;
 
-    private StardustConsole mStardustConsole;
+    private ConsoleImpl mConsoleImpl;
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        applyDayNightMode();
+    }
 
     @AfterViews
     void setupViews() {
         setToolbarAsBack(getString(R.string.text_log));
-        mStardustConsole = (StardustConsole) AutoJs.getInstance().getGlobalConsole();
-        mConsoleView.setConsole(mStardustConsole);
+        mConsoleImpl = AutoJs.getInstance().getGlobalConsole();
+        mConsoleView.setConsole(mConsoleImpl);
         mConsoleView.findViewById(R.id.input_container).setVisibility(View.GONE);
     }
 
     @Click(R.id.fab)
     void clearConsole() {
-        mStardustConsole.clear();
+        mConsoleImpl.clear();
     }
 }
diff --git a/app/src/main/java/org/autojs/autojs/ui/main/FloatingActionMenu.java b/app/src/main/java/org/autojs/autojs/ui/main/FloatingActionMenu.java
index e4c746fe..81526eec 100644
--- a/app/src/main/java/org/autojs/autojs/ui/main/FloatingActionMenu.java
+++ b/app/src/main/java/org/autojs/autojs/ui/main/FloatingActionMenu.java
@@ -3,11 +3,11 @@ package org.autojs.autojs.ui.main;
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.content.Context;
-import android.support.annotation.AttrRes;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.design.widget.FloatingActionButton;
-import android.support.v4.view.animation.FastOutSlowInInterpolator;
+import androidx.annotation.AttrRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+import androidx.interpolator.view.animation.FastOutSlowInInterpolator;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -16,9 +16,7 @@ import android.widget.FrameLayout;
 import android.widget.TextView;
 
 import org.autojs.autojs.R;
-import org.autojs.autojs.ui.common.ScriptOperations;
 
-import io.reactivex.Observable;
 import io.reactivex.subjects.PublishSubject;
 
 /**
diff --git a/app/src/main/java/org/autojs/autojs/ui/main/MainActivity.java b/app/src/main/java/org/autojs/autojs/ui/main/MainActivity.java
index e3313660..c55080c2 100644
--- a/app/src/main/java/org/autojs/autojs/ui/main/MainActivity.java
+++ b/app/src/main/java/org/autojs/autojs/ui/main/MainActivity.java
@@ -4,19 +4,22 @@ import android.Manifest;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.design.widget.FloatingActionButton;
-import android.support.design.widget.TabLayout;
-import android.support.v4.app.Fragment;
-import android.support.v4.view.ViewPager;
-import android.support.v4.widget.DrawerLayout;
-import android.support.v7.app.ActionBarDrawerToggle;
-import android.support.v7.widget.Toolbar;
+import androidx.annotation.NonNull;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+
+import androidx.core.view.GravityCompat;
+import androidx.fragment.app.Fragment;
+import androidx.drawerlayout.widget.DrawerLayout;
+import androidx.appcompat.app.ActionBarDrawerToggle;
+import androidx.appcompat.widget.Toolbar;
+import androidx.viewpager.widget.ViewPager;
+
 import android.view.Gravity;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 
+import com.google.android.material.tabs.TabLayout;
 import com.stardust.app.FragmentPagerAdapterBuilder;
 import com.stardust.app.OnActivityResultDelegate;
 import com.stardust.autojs.core.permission.OnRequestPermissionsResultCallback;
@@ -96,6 +99,7 @@ public class MainActivity extends BaseActivity implements OnActivityResultDelega
         mVersionGuard = new VersionGuard(this);
         showAnnunciationIfNeeded();
         EventBus.getDefault().register(this);
+        applyDayNightMode();
     }
 
     @AfterViews
@@ -154,7 +158,7 @@ public class MainActivity extends BaseActivity implements OnActivityResultDelega
     private void setUpToolbar() {
         Toolbar toolbar = $(R.id.toolbar);
         setSupportActionBar(toolbar);
-        toolbar.setTitle(R.string._app_name);
+        toolbar.setTitle(R.string.app_name);
         ActionBarDrawerToggle drawerToggle = new ActionBarDrawerToggle(this, mDrawerLayout, toolbar, R.string.text_drawer_open,
                 R.string.text_drawer_close);
         drawerToggle.syncState();
@@ -320,7 +324,7 @@ public class MainActivity extends BaseActivity implements OnActivityResultDelega
 
     @Subscribe
     public void onLoadUrl(CommunityFragment.LoadUrl loadUrl) {
-        mDrawerLayout.closeDrawer(Gravity.START);
+        mDrawerLayout.closeDrawer(GravityCompat.START);
     }
 
 
diff --git a/app/src/main/java/org/autojs/autojs/ui/main/ViewPagerFragment.java b/app/src/main/java/org/autojs/autojs/ui/main/ViewPagerFragment.java
index 068786c6..0cdd8441 100644
--- a/app/src/main/java/org/autojs/autojs/ui/main/ViewPagerFragment.java
+++ b/app/src/main/java/org/autojs/autojs/ui/main/ViewPagerFragment.java
@@ -1,10 +1,9 @@
 package org.autojs.autojs.ui.main;
 
-import android.support.annotation.CallSuper;
-import android.support.design.widget.FloatingActionButton;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentActivity;
-import android.support.v4.view.animation.FastOutSlowInInterpolator;
+import androidx.annotation.CallSuper;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+import androidx.fragment.app.Fragment;
+import androidx.interpolator.view.animation.FastOutSlowInInterpolator;
 import android.view.View;
 
 import com.stardust.util.BackPressedHandler;
diff --git a/app/src/main/java/org/autojs/autojs/ui/main/community/CommunityFragment.java b/app/src/main/java/org/autojs/autojs/ui/main/community/CommunityFragment.java
index 4cfc18b3..9e9bbee4 100644
--- a/app/src/main/java/org/autojs/autojs/ui/main/community/CommunityFragment.java
+++ b/app/src/main/java/org/autojs/autojs/ui/main/community/CommunityFragment.java
@@ -2,8 +2,8 @@ package org.autojs.autojs.ui.main.community;
 
 import android.app.Activity;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.design.widget.FloatingActionButton;
+import androidx.annotation.Nullable;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import android.webkit.WebView;
 
 import org.autojs.autojs.R;
@@ -117,7 +117,7 @@ public class CommunityFragment extends ViewPagerFragment implements BackPressedH
 
     private boolean isInPostsPage() {
         String url = mWebView.getUrl();
-        return url.matches(POSTS_PAGE_PATTERN);
+        return url != null &&  url.matches(POSTS_PAGE_PATTERN);
     }
 
     @Override
diff --git a/app/src/main/java/org/autojs/autojs/ui/main/community/CommunityWebView.java b/app/src/main/java/org/autojs/autojs/ui/main/community/CommunityWebView.java
index 4ccecd7e..032e40c4 100644
--- a/app/src/main/java/org/autojs/autojs/ui/main/community/CommunityWebView.java
+++ b/app/src/main/java/org/autojs/autojs/ui/main/community/CommunityWebView.java
@@ -3,8 +3,9 @@ package org.autojs.autojs.ui.main.community;
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.net.Uri;
-import android.support.design.widget.BottomSheetDialog;
-import android.support.design.widget.Snackbar;
+
+import com.google.android.material.bottomsheet.BottomSheetDialog;
+import com.google.android.material.snackbar.Snackbar;
 import android.util.AttributeSet;
 import android.webkit.ValueCallback;
 import android.webkit.WebView;
@@ -74,11 +75,11 @@ public class CommunityWebView extends EWebView {
                 .subscribe(file ->
                                 Snackbar.make(CommunityWebView.this, getResources().getString(R.string.format_file_downloaded, file.getPath())
                                         , Snackbar.LENGTH_LONG)
-                                        .setAction(R.string.text_open, v -> Scripts.edit(file))
+                                        .setAction(R.string.text_open, v -> Scripts.INSTANCE.edit(file))
                                         .show(),
                         error -> {
                             error.printStackTrace();
-                            Snackbar.make(CommunityWebView.this, R.string.text_download_failed, Toast.LENGTH_SHORT).show();
+                            Snackbar.make(CommunityWebView.this, R.string.text_download_failed, Snackbar.LENGTH_SHORT).show();
                         });
     }
 
@@ -92,7 +93,7 @@ public class CommunityWebView extends EWebView {
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(file -> {
                     Snackbar.make(CommunityWebView.this, R.string.text_start_running, Snackbar.LENGTH_SHORT).show();
-                    Scripts.run(file);
+                    Scripts.INSTANCE.run(file);
                 }, error -> {
                     error.printStackTrace();
                     Snackbar.make(CommunityWebView.this, R.string.text_download_failed, Toast.LENGTH_SHORT).show();
diff --git a/app/src/main/java/org/autojs/autojs/ui/main/drawer/DrawerFragment.java b/app/src/main/java/org/autojs/autojs/ui/main/drawer/DrawerFragment.java
index 36eab2b3..b5947cc7 100644
--- a/app/src/main/java/org/autojs/autojs/ui/main/drawer/DrawerFragment.java
+++ b/app/src/main/java/org/autojs/autojs/ui/main/drawer/DrawerFragment.java
@@ -1,32 +1,40 @@
 package org.autojs.autojs.ui.main.drawer;
 
 import android.annotation.SuppressLint;
+import android.app.AppOpsManager;
+import android.content.DialogInterface;
 import android.content.Intent;
-import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.os.Bundle;
 import android.provider.Settings;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
 import android.text.TextUtils;
 import android.view.View;
 import android.widget.TextView;
 import android.widget.Toast;
 
 import com.afollestad.materialdialogs.MaterialDialog;
+import com.bumptech.glide.Glide;
 import com.bumptech.glide.load.engine.DiskCacheStrategy;
+import com.bumptech.glide.request.RequestOptions;
+import com.bumptech.glide.request.target.CustomViewTarget;
 import com.bumptech.glide.request.target.SimpleTarget;
 import com.bumptech.glide.request.transition.Transition;
+import com.stardust.app.AppOpsKt;
 import com.stardust.app.GlobalAppContext;
 import com.stardust.notification.NotificationListenerService;
 
 import org.autojs.autojs.Pref;
 import org.autojs.autojs.R;
 import org.autojs.autojs.external.foreground.ForegroundService;
-import org.autojs.autojs.network.GlideApp;
 import org.autojs.autojs.network.UserService;
 import org.autojs.autojs.tool.Observers;
+import org.autojs.autojs.ui.BaseActivity;
 import org.autojs.autojs.ui.common.NotAskAgainDialog;
 import org.autojs.autojs.ui.floating.CircularMenu;
 import org.autojs.autojs.ui.floating.FloatyWindowManger;
@@ -61,6 +69,7 @@ import org.androidannotations.annotations.AfterViews;
 import org.androidannotations.annotations.Click;
 import org.androidannotations.annotations.EFragment;
 import org.androidannotations.annotations.ViewById;
+import org.autojs.autojs.ui.widget.BackgroundTarget;
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
@@ -79,7 +88,7 @@ import io.reactivex.schedulers.Schedulers;
  * TODO these codes are so ugly!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
  */
 @EFragment(R.layout.fragment_drawer)
-public class DrawerFragment extends android.support.v4.app.Fragment {
+public class DrawerFragment extends androidx.fragment.app.Fragment {
 
     private static final String URL_DEV_PLUGIN = "https://www.autojs.org/topic/968/";
 
@@ -109,6 +118,7 @@ public class DrawerFragment extends android.support.v4.app.Fragment {
     };
 
     private DrawerMenuItem mNotificationPermissionItem = new DrawerMenuItem(R.drawable.ic_ali_notification, R.string.text_notification_permission, 0, this::goToNotificationServiceSettings);
+    private DrawerMenuItem mUsageStatsPermissionItem = new DrawerMenuItem(R.drawable.ic_ali_notification, R.string.text_usage_stats_permission, 0, this::goToUsageStatsSettings);
     private DrawerMenuItem mForegroundServiceItem = new DrawerMenuItem(R.drawable.ic_service_green, R.string.text_foreground_service, R.string.key_foreground_servie, this::toggleForegroundService);
 
     private DrawerMenuItem mFloatingWindowItem = new DrawerMenuItem(R.drawable.ic_robot_64, R.string.text_floating_window, 0, this::showOrDismissFloatingWindow);
@@ -146,7 +156,7 @@ public class DrawerFragment extends android.support.v4.app.Fragment {
             setChecked(mFloatingWindowItem, true);
         }
         setChecked(mConnectionItem, DevPluginService.getInstance().isConnected());
-        if(Pref.isForegroundServiceEnabled()){
+        if (Pref.isForegroundServiceEnabled()) {
             ForegroundService.start(GlobalAppContext.get());
             setChecked(mForegroundServiceItem, true);
         }
@@ -159,6 +169,7 @@ public class DrawerFragment extends android.support.v4.app.Fragment {
                 mStableModeItem,
                 mNotificationPermissionItem,
                 mForegroundServiceItem,
+                mUsageStatsPermissionItem,
 
                 new DrawerMenuGroup(R.string.text_script_record),
                 mFloatingWindowItem,
@@ -167,6 +178,7 @@ public class DrawerFragment extends android.support.v4.app.Fragment {
                 new DrawerMenuGroup(R.string.text_others),
                 mConnectionItem,
                 new DrawerMenuItem(R.drawable.ic_personalize, R.string.text_theme_color, this::openThemeColorSettings),
+                new DrawerMenuItem(R.drawable.ic_night_mode, R.string.text_night_mode, R.string.key_night_mode, this::toggleNightMode),
                 mCheckForUpdatesItem
         )));
         mDrawerMenu.setAdapter(mDrawerMenuAdapter);
@@ -204,7 +216,7 @@ public class DrawerFragment extends android.support.v4.app.Fragment {
         if (checked && !isAccessibilityServiceEnabled) {
             enableAccessibilityService();
         } else if (!checked && isAccessibilityServiceEnabled) {
-            if (!AccessibilityService.disable()) {
+            if (!AccessibilityService.Companion.disable()) {
                 AccessibilityServiceTool.goToAccessibilitySetting();
             }
         }
@@ -214,13 +226,34 @@ public class DrawerFragment extends android.support.v4.app.Fragment {
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP_MR1) {
             return;
         }
-        boolean enabled = NotificationListenerService.getInstance() != null;
+        boolean enabled = NotificationListenerService.Companion.getInstance() != null;
         boolean checked = holder.getSwitchCompat().isChecked();
         if ((checked && !enabled) || (!checked && enabled)) {
             startActivity(new Intent(Settings.ACTION_NOTIFICATION_LISTENER_SETTINGS));
         }
     }
 
+    void goToUsageStatsSettings(DrawerMenuItemViewHolder holder) {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
+            return;
+        }
+        boolean enabled = AppOpsKt.isOpPermissionGranted(getContext(), AppOpsManager.OPSTR_GET_USAGE_STATS);
+        boolean checked = holder.getSwitchCompat().isChecked();
+        if(checked && !enabled){
+            if(new NotAskAgainDialog.Builder(getContext(), "DrawerFragment.usage_stats")
+                    .title(R.string.text_usage_stats_permission)
+                    .content(R.string.description_usage_stats_permission)
+                    .positiveText(R.string.ok)
+                    .dismissListener(dialog -> IntentUtil.requestAppUsagePermission(getContext()))
+                    .show() == null){
+                IntentUtil.requestAppUsagePermission(getContext());
+            }
+        }
+        if (!checked && enabled) {
+            IntentUtil.requestAppUsagePermission(getContext());
+        }
+    }
+
     void showOrDismissFloatingWindow(DrawerMenuItemViewHolder holder) {
         boolean isFloatingWindowShowing = FloatyWindowManger.isCircularMenuShowing();
         boolean checked = holder.getSwitchCompat().isChecked();
@@ -239,6 +272,10 @@ public class DrawerFragment extends android.support.v4.app.Fragment {
         SettingsActivity.selectThemeColor(getActivity());
     }
 
+    void toggleNightMode(DrawerMenuItemViewHolder holder) {
+        ((BaseActivity) getActivity()).setNightModeEnabled(holder.getSwitchCompat().isChecked());
+    }
+
     @SuppressLint("CheckResult")
     private void enableAccessibilityServiceByRootIfNeeded() {
         Observable.fromCallable(() -> Pref.shouldEnableAccessibilityServiceByRoot() && !isAccessibilityServiceEnabled())
@@ -264,9 +301,9 @@ public class DrawerFragment extends android.support.v4.app.Fragment {
 
     private void toggleForegroundService(DrawerMenuItemViewHolder holder) {
         boolean checked = holder.getSwitchCompat().isChecked();
-        if(checked){
+        if (checked) {
             ForegroundService.start(GlobalAppContext.get());
-        }else {
+        } else {
             ForegroundService.stop(GlobalAppContext.get());
         }
     }
@@ -367,26 +404,23 @@ public class DrawerFragment extends android.support.v4.app.Fragment {
         } else {
             mDefaultCover.setVisibility(View.GONE);
             mShadow.setVisibility(View.VISIBLE);
-            GlideApp.with(getContext())
+            Glide.with(this)
                     .load(NodeBB.BASE_URL + user.getCoverUrl())
-                    .diskCacheStrategy(DiskCacheStrategy.NONE)
-                    .into(new SimpleTarget<Drawable>() {
-                        @Override
-                        public void onResourceReady(Drawable resource, Transition<? super Drawable> transition) {
-                            if (mHeaderView != null) {
-                                mHeaderView.setBackground(resource);
-                            }
-                        }
-                    });
+                    .apply(new RequestOptions()
+                            .diskCacheStrategy(DiskCacheStrategy.NONE)
+                    )
+                    .into(new BackgroundTarget(mHeaderView));
         }
     }
 
     private void syncSwitchState() {
         setChecked(mAccessibilityServiceItem, AccessibilityServiceTool.isAccessibilityServiceEnabled(getActivity()));
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2) {
-            setChecked(mNotificationPermissionItem, NotificationListenerService.getInstance() != null);
+            setChecked(mNotificationPermissionItem, NotificationListenerService.Companion.getInstance() != null);
+        }
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            setChecked(mUsageStatsPermissionItem, AppOpsKt.isOpPermissionGranted(getContext(), AppOpsManager.OPSTR_GET_USAGE_STATS));
         }
-
     }
 
     private void enableAccessibilityService() {
diff --git a/app/src/main/java/org/autojs/autojs/ui/main/drawer/DrawerMenuAdapter.java b/app/src/main/java/org/autojs/autojs/ui/main/drawer/DrawerMenuAdapter.java
index c8e0c4ad..a4819dd0 100644
--- a/app/src/main/java/org/autojs/autojs/ui/main/drawer/DrawerMenuAdapter.java
+++ b/app/src/main/java/org/autojs/autojs/ui/main/drawer/DrawerMenuAdapter.java
@@ -1,13 +1,12 @@
 package org.autojs.autojs.ui.main.drawer;
 
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.ViewGroup;
 
 import org.autojs.autojs.R;
 import org.autojs.autojs.ui.widget.BindableViewHolder;
 
-import java.util.ArrayList;
 import java.util.List;
 
 /**
diff --git a/app/src/main/java/org/autojs/autojs/ui/main/drawer/DrawerMenuGroupViewHolder.java b/app/src/main/java/org/autojs/autojs/ui/main/drawer/DrawerMenuGroupViewHolder.java
index 71530dcf..2a0c4df9 100644
--- a/app/src/main/java/org/autojs/autojs/ui/main/drawer/DrawerMenuGroupViewHolder.java
+++ b/app/src/main/java/org/autojs/autojs/ui/main/drawer/DrawerMenuGroupViewHolder.java
@@ -1,6 +1,6 @@
 package org.autojs.autojs.ui.main.drawer;
 
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.View;
 import android.widget.TextView;
 
diff --git a/app/src/main/java/org/autojs/autojs/ui/main/sample/MarketFragment.java b/app/src/main/java/org/autojs/autojs/ui/main/sample/MarketFragment.java
index 5269ad05..5de77050 100644
--- a/app/src/main/java/org/autojs/autojs/ui/main/sample/MarketFragment.java
+++ b/app/src/main/java/org/autojs/autojs/ui/main/sample/MarketFragment.java
@@ -2,8 +2,8 @@ package org.autojs.autojs.ui.main.sample;
 
 import android.app.Activity;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.design.widget.FloatingActionButton;
+import androidx.annotation.Nullable;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
 
 import org.autojs.autojs.R;
 import org.autojs.autojs.ui.main.QueryEvent;
diff --git a/app/src/main/java/org/autojs/autojs/ui/main/scripts/MyScriptListFragment.java b/app/src/main/java/org/autojs/autojs/ui/main/scripts/MyScriptListFragment.java
index 559bf5aa..bc6cb785 100644
--- a/app/src/main/java/org/autojs/autojs/ui/main/scripts/MyScriptListFragment.java
+++ b/app/src/main/java/org/autojs/autojs/ui/main/scripts/MyScriptListFragment.java
@@ -3,8 +3,8 @@ package org.autojs.autojs.ui.main.scripts;
 import android.app.Activity;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
-import android.support.annotation.Nullable;
-import android.support.design.widget.FloatingActionButton;
+import androidx.annotation.Nullable;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
 
 import com.stardust.app.GlobalAppContext;
 import com.stardust.util.IntentUtil;
@@ -62,7 +62,7 @@ public class MyScriptListFragment extends ViewPagerFragment implements FloatingA
         mExplorerView.setExplorer(Explorers.workspace(), ExplorerDirPage.createRoot(Pref.getScriptDirPath()));
         mExplorerView.setOnItemClickListener((view, item) -> {
             if (item.isEditable()) {
-                Scripts.edit(item.toScriptFile());
+                Scripts.INSTANCE.edit(item.toScriptFile());
             } else {
                 IntentUtil.viewFile(GlobalAppContext.get(), item.getPath(), AppFileProvider.AUTHORITY);
             }
diff --git a/app/src/main/java/org/autojs/autojs/ui/main/task/TaskListRecyclerView.java b/app/src/main/java/org/autojs/autojs/ui/main/task/TaskListRecyclerView.java
index 3371aa46..c73a6437 100644
--- a/app/src/main/java/org/autojs/autojs/ui/main/task/TaskListRecyclerView.java
+++ b/app/src/main/java/org/autojs/autojs/ui/main/task/TaskListRecyclerView.java
@@ -2,9 +2,9 @@ package org.autojs.autojs.ui.main.task;
 
 import android.content.Context;
 import android.graphics.drawable.GradientDrawable;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.ThemeColorRecyclerView;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.content.ContextCompat;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -16,7 +16,6 @@ import android.widget.TextView;
 import com.bignerdranch.expandablerecyclerview.ChildViewHolder;
 import com.bignerdranch.expandablerecyclerview.ExpandableRecyclerAdapter;
 import com.bignerdranch.expandablerecyclerview.ParentViewHolder;
-import com.stardust.autojs.ScriptEngineService;
 import com.stardust.autojs.execution.ScriptExecution;
 import com.stardust.autojs.execution.ScriptExecutionListener;
 import com.stardust.autojs.execution.SimpleScriptExecutionListener;
@@ -26,11 +25,7 @@ import com.yqritc.recyclerviewflexibledivider.HorizontalDividerItemDecoration;
 
 import org.autojs.autojs.R;
 import org.autojs.autojs.autojs.AutoJs;
-import org.autojs.autojs.external.tasker.TaskerScriptEditActivity;
 import org.autojs.autojs.storage.database.ModelChange;
-import org.autojs.autojs.timing.IntentTask;
-import org.autojs.autojs.timing.TaskReceiver;
-import org.autojs.autojs.timing.TimedTask;
 import org.autojs.autojs.timing.TimedTaskManager;
 import org.autojs.autojs.ui.timing.TimedTaskSettingActivity;
 import org.autojs.autojs.ui.timing.TimedTaskSettingActivity_;
@@ -38,6 +33,7 @@ import org.autojs.autojs.ui.timing.TimedTaskSettingActivity_;
 import java.util.ArrayList;
 import java.util.List;
 
+import androidx.recyclerview.widget.ThemeColorRecyclerView;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
@@ -62,7 +58,7 @@ public class TaskListRecyclerView extends ThemeColorRecyclerView {
     private ScriptExecutionListener mScriptExecutionListener = new SimpleScriptExecutionListener() {
         @Override
         public void onStart(final ScriptExecution execution) {
-            post(()-> mAdapter.notifyChildInserted(0, mRunningTaskGroup.addTask(execution)));
+            post(() -> mAdapter.notifyChildInserted(0, mRunningTaskGroup.addTask(execution)));
         }
 
         @Override
@@ -71,12 +67,12 @@ public class TaskListRecyclerView extends ThemeColorRecyclerView {
         }
 
         @Override
-        public void onException(ScriptExecution execution, Exception e) {
+        public void onException(ScriptExecution execution, Throwable e) {
             onFinish(execution);
         }
 
-        private void onFinish(ScriptExecution execution){
-            post(()->{
+        private void onFinish(ScriptExecution execution) {
+            post(() -> {
                 final int i = mRunningTaskGroup.removeTask(execution);
                 if (i >= 0) {
                     mAdapter.notifyChildRemoved(0, i);
@@ -105,7 +101,7 @@ public class TaskListRecyclerView extends ThemeColorRecyclerView {
     private void init() {
         setLayoutManager(new WrapContentLinearLayoutManager(getContext()));
         addItemDecoration(new HorizontalDividerItemDecoration.Builder(getContext())
-                .color(0xffEDEEEF)
+                .color(ContextCompat.getColor(getContext(), R.color.divider))
                 .size(2)
                 .marginResId(R.dimen.script_and_folder_list_divider_left_margin, R.dimen.script_and_folder_list_divider_right_margin)
                 .showLastDivider()
diff --git a/app/src/main/java/org/autojs/autojs/ui/main/task/TaskManagerFragment.java b/app/src/main/java/org/autojs/autojs/ui/main/task/TaskManagerFragment.java
index d6ffb284..425a8d1a 100644
--- a/app/src/main/java/org/autojs/autojs/ui/main/task/TaskManagerFragment.java
+++ b/app/src/main/java/org/autojs/autojs/ui/main/task/TaskManagerFragment.java
@@ -2,8 +2,8 @@ package org.autojs.autojs.ui.main.task;
 
 import android.app.Activity;
 import android.os.Bundle;
-import android.support.design.widget.FloatingActionButton;
-import android.support.v4.widget.SwipeRefreshLayout;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 import android.view.View;
 
 import org.autojs.autojs.R;
diff --git a/app/src/main/java/org/autojs/autojs/ui/project/BuildActivity.java b/app/src/main/java/org/autojs/autojs/ui/project/BuildActivity.java
index 7feaa877..928583d3 100644
--- a/app/src/main/java/org/autojs/autojs/ui/project/BuildActivity.java
+++ b/app/src/main/java/org/autojs/autojs/ui/project/BuildActivity.java
@@ -5,18 +5,18 @@ import android.content.Intent;
 import android.graphics.Bitmap;
 import android.os.Bundle;
 import android.os.Environment;
-import android.support.annotation.Nullable;
-import android.support.design.widget.TextInputEditText;
-import android.support.design.widget.TextInputLayout;
-import android.support.v7.widget.CardView;
+import androidx.annotation.Nullable;
+import androidx.cardview.widget.CardView;
 import android.text.Editable;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.View;
+import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.Toast;
 
 import com.afollestad.materialdialogs.MaterialDialog;
+import com.google.android.material.textfield.TextInputLayout;
 import com.stardust.autojs.project.ProjectConfig;
 import com.stardust.util.IntentUtil;
 
@@ -26,7 +26,7 @@ import org.androidannotations.annotations.EActivity;
 import org.androidannotations.annotations.ViewById;
 import org.autojs.autojs.Pref;
 import org.autojs.autojs.R;
-import org.autojs.autojs.autojs.build.AutoJsApkBuilder;
+import org.autojs.autojs.autojs.build.ApkBuilder;
 import org.autojs.autojs.build.ApkBuilderPluginHelper;
 import org.autojs.autojs.external.fileprovider.AppFileProvider;
 import org.autojs.autojs.model.script.ScriptFile;
@@ -43,6 +43,7 @@ import java.util.Locale;
 import java.util.concurrent.Callable;
 import java.util.regex.Pattern;
 
+import androidx.cardview.widget.CardView;
 import io.reactivex.Observable;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.schedulers.Schedulers;
@@ -51,7 +52,7 @@ import io.reactivex.schedulers.Schedulers;
  * Created by Stardust on 2017/10/22.
  */
 @EActivity(R.layout.activity_build)
-public class BuildActivity extends BaseActivity implements AutoJsApkBuilder.ProgressCallback {
+public class BuildActivity extends BaseActivity implements ApkBuilder.ProgressCallback {
 
     private static final int REQUEST_CODE = 44401;
 
@@ -61,25 +62,25 @@ public class BuildActivity extends BaseActivity implements AutoJsApkBuilder.Prog
     private static final Pattern REGEX_PACKAGE_NAME = Pattern.compile("^([A-Za-z][A-Za-z\\d_]*\\.)+([A-Za-z][A-Za-z\\d_]*)$");
 
     @ViewById(R.id.source_path)
-    TextInputEditText mSourcePath;
+    EditText mSourcePath;
 
     @ViewById(R.id.source_path_container)
     View mSourcePathContainer;
 
     @ViewById(R.id.output_path)
-    TextInputEditText mOutputPath;
+    EditText mOutputPath;
 
     @ViewById(R.id.app_name)
-    TextInputEditText mAppName;
+    EditText mAppName;
 
     @ViewById(R.id.package_name)
-    TextInputEditText mPackageName;
+    EditText mPackageName;
 
     @ViewById(R.id.version_name)
-    TextInputEditText mVersionName;
+    EditText mVersionName;
 
     @ViewById(R.id.version_code)
-    TextInputEditText mVersionCode;
+    EditText mVersionCode;
 
     @ViewById(R.id.icon)
     ImageView mIcon;
@@ -224,14 +225,14 @@ public class BuildActivity extends BaseActivity implements AutoJsApkBuilder.Prog
         return inputValid;
     }
 
-    private boolean checkPackageNameValid(TextInputEditText editText) {
+    private boolean checkPackageNameValid(EditText editText) {
         Editable text = editText.getText();
         String hint = ((TextInputLayout) editText.getParent().getParent()).getHint().toString();
-        if(TextUtils.isEmpty(text)){
+        if (TextUtils.isEmpty(text)) {
             editText.setError(hint + getString(R.string.text_should_not_be_empty));
             return false;
         }
-        if(!REGEX_PACKAGE_NAME.matcher(text).matches()){
+        if (!REGEX_PACKAGE_NAME.matcher(text).matches()) {
             editText.setError(getString(R.string.text_invalid_package_name));
             return false;
         }
@@ -239,7 +240,7 @@ public class BuildActivity extends BaseActivity implements AutoJsApkBuilder.Prog
 
     }
 
-    private boolean checkNotEmpty(TextInputEditText editText) {
+    private boolean checkNotEmpty(EditText editText) {
         if (!TextUtils.isEmpty(editText.getText()) || !editText.isShown())
             return true;
         // TODO: 2017/12/8 more beautiful ways?
@@ -250,7 +251,7 @@ public class BuildActivity extends BaseActivity implements AutoJsApkBuilder.Prog
 
     @SuppressLint("CheckResult")
     private void doBuildingApk() {
-        AutoJsApkBuilder.AppConfig appConfig = createAppConfig();
+        ApkBuilder.AppConfig appConfig = createAppConfig();
         File tmpDir = new File(getCacheDir(), "build/");
         File outApk = new File(mOutputPath.getText().toString(),
                 String.format("%s_v%s.apk", appConfig.getAppName(), appConfig.getVersionName()));
@@ -262,16 +263,16 @@ public class BuildActivity extends BaseActivity implements AutoJsApkBuilder.Prog
                         this::onBuildFailed);
     }
 
-    private AutoJsApkBuilder.AppConfig createAppConfig() {
+    private ApkBuilder.AppConfig createAppConfig() {
         if (mProjectConfig != null) {
-            return AutoJsApkBuilder.AppConfig.fromProjectConfig(mSource, mProjectConfig);
+            return ApkBuilder.AppConfig.fromProjectConfig(mSource, mProjectConfig);
         }
         String jsPath = mSourcePath.getText().toString();
         String versionName = mVersionName.getText().toString();
         int versionCode = Integer.parseInt(mVersionCode.getText().toString());
         String appName = mAppName.getText().toString();
         String packageName = mPackageName.getText().toString();
-        return new AutoJsApkBuilder.AppConfig()
+        return new ApkBuilder.AppConfig()
                 .setAppName(appName)
                 .setSourcePath(jsPath)
                 .setPackageName(packageName)
@@ -282,9 +283,9 @@ public class BuildActivity extends BaseActivity implements AutoJsApkBuilder.Prog
                 );
     }
 
-    private AutoJsApkBuilder callApkBuilder(File tmpDir, File outApk, AutoJsApkBuilder.AppConfig appConfig) throws Exception {
+    private ApkBuilder callApkBuilder(File tmpDir, File outApk, ApkBuilder.AppConfig appConfig) throws Exception {
         InputStream templateApk = ApkBuilderPluginHelper.openTemplateApk(BuildActivity.this);
-        return new AutoJsApkBuilder(templateApk, outApk, tmpDir.getPath())
+        return new ApkBuilder(templateApk, outApk, tmpDir.getPath())
                 .setProgressCallback(BuildActivity.this)
                 .prepare()
                 .withConfig(appConfig)
@@ -302,8 +303,10 @@ public class BuildActivity extends BaseActivity implements AutoJsApkBuilder.Prog
     }
 
     private void onBuildFailed(Throwable error) {
-        mProgressDialog.dismiss();
-        mProgressDialog = null;
+        if (mProgressDialog != null) {
+            mProgressDialog.dismiss();
+            mProgressDialog = null;
+        }
         Toast.makeText(this, getString(R.string.text_build_failed) + error.getMessage(), Toast.LENGTH_SHORT).show();
         Log.e(LOG_TAG, "Build failed", error);
     }
@@ -324,24 +327,24 @@ public class BuildActivity extends BaseActivity implements AutoJsApkBuilder.Prog
     }
 
     @Override
-    public void onPrepare(AutoJsApkBuilder builder) {
+    public void onPrepare(ApkBuilder builder) {
         mProgressDialog.setContent(R.string.apk_builder_prepare);
     }
 
     @Override
-    public void onBuild(AutoJsApkBuilder builder) {
+    public void onBuild(ApkBuilder builder) {
         mProgressDialog.setContent(R.string.apk_builder_build);
 
     }
 
     @Override
-    public void onSign(AutoJsApkBuilder builder) {
+    public void onSign(ApkBuilder builder) {
         mProgressDialog.setContent(R.string.apk_builder_package);
 
     }
 
     @Override
-    public void onClean(AutoJsApkBuilder builder) {
+    public void onClean(ApkBuilder builder) {
         mProgressDialog.setContent(R.string.apk_builder_clean);
     }
 
diff --git a/app/src/main/java/org/autojs/autojs/ui/project/ProjectConfigActivity.java b/app/src/main/java/org/autojs/autojs/ui/project/ProjectConfigActivity.java
index 03210a45..704113ae 100644
--- a/app/src/main/java/org/autojs/autojs/ui/project/ProjectConfigActivity.java
+++ b/app/src/main/java/org/autojs/autojs/ui/project/ProjectConfigActivity.java
@@ -4,9 +4,7 @@ import android.annotation.SuppressLint;
 import android.content.Intent;
 import android.graphics.Bitmap;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.design.widget.TextInputEditText;
-import android.support.design.widget.TextInputLayout;
+import androidx.annotation.Nullable;
 import android.text.Editable;
 import android.text.TextUtils;
 import android.view.View;
@@ -14,6 +12,8 @@ import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.Toast;
 
+import com.bumptech.glide.Glide;
+import com.google.android.material.textfield.TextInputLayout;
 import com.stardust.autojs.project.ProjectConfig;
 import com.stardust.pio.PFiles;
 
@@ -26,7 +26,6 @@ import org.autojs.autojs.model.explorer.ExplorerDirPage;
 import org.autojs.autojs.model.explorer.ExplorerFileItem;
 import org.autojs.autojs.model.explorer.Explorers;
 import org.autojs.autojs.model.project.ProjectTemplate;
-import org.autojs.autojs.network.GlideApp;
 import org.autojs.autojs.theme.dialog.ThemeColorMaterialDialogBuilder;
 import org.autojs.autojs.ui.BaseActivity;
 import org.autojs.autojs.ui.shortcut.ShortcutIconSelectActivity;
@@ -35,7 +34,6 @@ import org.autojs.autojs.ui.widget.SimpleTextWatcher;
 
 import java.io.File;
 import java.io.FileOutputStream;
-import java.io.IOException;
 import java.util.regex.Pattern;
 
 import io.reactivex.Observable;
@@ -59,16 +57,16 @@ public class ProjectConfigActivity extends BaseActivity {
     EditText mProjectLocation;
 
     @ViewById(R.id.app_name)
-    TextInputEditText mAppName;
+    EditText mAppName;
 
     @ViewById(R.id.package_name)
-    TextInputEditText mPackageName;
+    EditText mPackageName;
 
     @ViewById(R.id.version_name)
-    TextInputEditText mVersionName;
+    EditText mVersionName;
 
     @ViewById(R.id.version_code)
-    TextInputEditText mVersionCode;
+    EditText mVersionCode;
 
     @ViewById(R.id.main_file_name)
     EditText mMainFileName;
@@ -131,7 +129,7 @@ public class ProjectConfigActivity extends BaseActivity {
             mProjectLocation.setVisibility(View.GONE);
             String icon = mProjectConfig.getIcon();
             if (icon != null) {
-                GlideApp.with(this)
+                Glide.with(this)
                         .load(new File(mDirectory, icon))
                         .into(mIcon);
             }
@@ -216,7 +214,7 @@ public class ProjectConfigActivity extends BaseActivity {
         return inputValid;
     }
 
-    private boolean checkPackageNameValid(TextInputEditText editText) {
+    private boolean checkPackageNameValid(EditText editText) {
         Editable text = editText.getText();
         String hint = ((TextInputLayout) editText.getParent().getParent()).getHint().toString();
         if(TextUtils.isEmpty(text)){
@@ -231,7 +229,7 @@ public class ProjectConfigActivity extends BaseActivity {
 
     }
 
-    private boolean checkNotEmpty(TextInputEditText editText) {
+    private boolean checkNotEmpty(EditText editText) {
         if (!TextUtils.isEmpty(editText.getText()))
             return true;
         // TODO: 2017/12/8 more beautiful ways?
diff --git a/app/src/main/java/org/autojs/autojs/ui/settings/ScriptDirPathPreference.java b/app/src/main/java/org/autojs/autojs/ui/settings/ScriptDirPathPreference.java
index f308dc4a..eb56979c 100644
--- a/app/src/main/java/org/autojs/autojs/ui/settings/ScriptDirPathPreference.java
+++ b/app/src/main/java/org/autojs/autojs/ui/settings/ScriptDirPathPreference.java
@@ -1,7 +1,7 @@
 package org.autojs.autojs.ui.settings;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.view.View;
diff --git a/app/src/main/java/org/autojs/autojs/ui/settings/SettingsActivity.java b/app/src/main/java/org/autojs/autojs/ui/settings/SettingsActivity.java
index a8423d6d..177805de 100644
--- a/app/src/main/java/org/autojs/autojs/ui/settings/SettingsActivity.java
+++ b/app/src/main/java/org/autojs/autojs/ui/settings/SettingsActivity.java
@@ -5,8 +5,8 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.preference.Preference;
 import android.preference.PreferenceScreen;
-import android.support.v4.util.Pair;
-import android.support.v7.widget.Toolbar;
+import androidx.core.util.Pair;
+import androidx.appcompat.widget.Toolbar;
 import android.view.View;
 
 import com.stardust.theme.app.ColorSelectActivity;
diff --git a/app/src/main/java/org/autojs/autojs/ui/shortcut/ShortcutCreateActivity.java b/app/src/main/java/org/autojs/autojs/ui/shortcut/ShortcutCreateActivity.java
index 67716426..2aec7e0a 100644
--- a/app/src/main/java/org/autojs/autojs/ui/shortcut/ShortcutCreateActivity.java
+++ b/app/src/main/java/org/autojs/autojs/ui/shortcut/ShortcutCreateActivity.java
@@ -10,9 +10,9 @@ import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.PersistableBundle;
-import android.support.annotation.Nullable;
-import android.support.annotation.RequiresApi;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
+import androidx.appcompat.app.AppCompatActivity;
 import android.util.Log;
 import android.view.View;
 import android.widget.CheckBox;
diff --git a/app/src/main/java/org/autojs/autojs/ui/shortcut/ShortcutIconSelectActivity.java b/app/src/main/java/org/autojs/autojs/ui/shortcut/ShortcutIconSelectActivity.java
index b3905eca..cf7853e3 100644
--- a/app/src/main/java/org/autojs/autojs/ui/shortcut/ShortcutIconSelectActivity.java
+++ b/app/src/main/java/org/autojs/autojs/ui/shortcut/ShortcutIconSelectActivity.java
@@ -5,13 +5,12 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
-import android.content.pm.ShortcutManager;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -30,7 +29,6 @@ import org.autojs.autojs.workground.WrapContentGridLayoutManger;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.concurrent.Callable;
 
 import io.reactivex.Observable;
 import io.reactivex.android.schedulers.AndroidSchedulers;
diff --git a/app/src/main/java/org/autojs/autojs/ui/splash/SplashActivity.java b/app/src/main/java/org/autojs/autojs/ui/splash/SplashActivity.java
index 62411794..aec2b8fc 100644
--- a/app/src/main/java/org/autojs/autojs/ui/splash/SplashActivity.java
+++ b/app/src/main/java/org/autojs/autojs/ui/splash/SplashActivity.java
@@ -1,147 +1,62 @@
 package org.autojs.autojs.ui.splash;
 
-import android.Manifest;
 import android.os.Bundle;
 import android.os.Handler;
-import android.os.SystemClock;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.util.Log;
-import android.view.View;
+import androidx.annotation.Nullable;
 
-import com.stardust.autojs.core.image.OpenCVHelper;
-import com.xcy8.ads.listener.LoadAdListener;
-import com.xcy8.ads.view.FullScreenAdView;
-
-import org.autojs.autojs.Constants;
-import org.autojs.autojs.Pref;
 import org.autojs.autojs.R;
 import org.autojs.autojs.ui.BaseActivity;
 import org.autojs.autojs.ui.main.MainActivity_;
 
-import java.util.Random;
-
 /**
  * Created by Stardust on 2017/7/7.
  */
 public class SplashActivity extends BaseActivity {
 
-    public static final String NOT_START_MAIN_ACTIVITY = "notStartMainActivity";
-    public static final String FORCE_SHOW_AD = "forceShowAd";
 
     private static final String LOG_TAG = SplashActivity.class.getSimpleName();
-    private static final long INIT_TIMEOUT = 1500;
+    private static final long INIT_TIMEOUT = 800;
 
-
-    private boolean mCanEnterNextActivity = false;
-    private boolean mNotStartMainActivity;
     private boolean mAlreadyEnterNextActivity = false;
-    private boolean mAdLoading = false;
-
+    private boolean mPaused;
     private Handler mHandler;
 
-    FullScreenAdView mFullScreenAdView;
-
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         init();
-        boolean forceShowAd = getIntent().getBooleanExtra(FORCE_SHOW_AD, false);
-        final long millis = SystemClock.uptimeMillis();
-        if (!forceShowAd && !Pref.shouldShowAd()) {
-            mFullScreenAdView.setVisibility(View.INVISIBLE);
-        } else {
-            if (checkPermission(Manifest.permission.READ_PHONE_STATE)) {
-                fetchSplashAD();
-            }
-        }
-        OpenCVHelper.initIfNeeded(this, () -> {
-            long delay = INIT_TIMEOUT - (SystemClock.uptimeMillis() - millis);
-            if (delay <= 0) {
-                enterNextActivity();
-                return;
-            }
-            mHandler.postDelayed(SplashActivity.this::enterNextActivity, delay);
-        });
+        mHandler.postDelayed(SplashActivity.this::enterNextActivity, INIT_TIMEOUT);
     }
 
     private void init() {
         setContentView(R.layout.activity_splash);
-        mFullScreenAdView = findViewById(R.id.full_screen_view);
         mHandler = new Handler();
-        mNotStartMainActivity = getIntent().getBooleanExtra(NOT_START_MAIN_ACTIVITY, false);
-    }
-
-    void enterNextActivity() {
-        if (mAlreadyEnterNextActivity)
-            return;
-        mAlreadyEnterNextActivity = true;
-        if (!mNotStartMainActivity)
-            MainActivity_.intent(this).start();
-        finish();
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-        //enterNextActivityIfNeeded();
     }
 
     @Override
     protected void onPause() {
         super.onPause();
-        mCanEnterNextActivity = false;
+        mPaused = true;
     }
 
-    private void enterNextActivityIfNeeded() {
-        if (mCanEnterNextActivity) {
+    @Override
+    protected void onResume() {
+        super.onResume();
+        if (mPaused) {
+            mPaused = false;
             enterNextActivity();
+        }
+    }
+
+    void enterNextActivity() {
+        if (mAlreadyEnterNextActivity)
+            return;
+        if (mPaused) {
             return;
         }
-        mCanEnterNextActivity = true;
+        mAlreadyEnterNextActivity = true;
+        MainActivity_.intent(this).start();
+        finish();
     }
 
-    @Override
-    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
-        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
-        fetchSplashAD();
-    }
-
-    private void fetchSplashAD() {
-        mAdLoading = true;
-        mFullScreenAdView.setFullScreenListener(this::enterNextActivity);
-        mFullScreenAdView.setLoadAdListener(new LoadAdListener() {
-            @Override
-            public void onSuccess() {
-                mAdLoading = false;
-                Log.d(LOG_TAG, "onAdLoadSuccess");
-            }
-
-            @Override
-            public void onFailure(String s) {
-                mAdLoading = false;
-                Log.e(LOG_TAG, "onAdLoadFailure: " + s);
-                enterNextActivity();
-            }
-        });
-        mHandler.postDelayed(() -> {
-            if (mAdLoading) {
-                enterNextActivity();
-            }
-        }, 2000);
-        mFullScreenAdView.loadAd(getAdId(), false);
-    }
-
-    private String getAdId() {
-        int type = Pref.getAdType();
-        int id = type >= 1 && type <= Constants.UMENG_IDS.length ? Constants.UMENG_IDS[type - 1]
-                : Constants.UMENG_IDS[new Random().nextInt(Constants.UMENG_IDS.length)];
-        return String.valueOf(id);
-    }
-
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-        mFullScreenAdView.clean();
-    }
 }
diff --git a/app/src/main/java/org/autojs/autojs/ui/timing/TimedTaskSettingActivity.java b/app/src/main/java/org/autojs/autojs/ui/timing/TimedTaskSettingActivity.java
index 5c963612..529ee36c 100644
--- a/app/src/main/java/org/autojs/autojs/ui/timing/TimedTaskSettingActivity.java
+++ b/app/src/main/java/org/autojs/autojs/ui/timing/TimedTaskSettingActivity.java
@@ -1,18 +1,18 @@
 package org.autojs.autojs.ui.timing;
 
+import android.annotation.SuppressLint;
 import android.app.DatePickerDialog;
 import android.app.TimePickerDialog;
 import android.content.ActivityNotFoundException;
 import android.content.Intent;
-import android.graphics.ColorFilter;
 import android.net.ConnectivityManager;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.PowerManager;
 import android.provider.Settings;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.Toolbar;
+import androidx.annotation.Nullable;
+import androidx.appcompat.widget.Toolbar;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.Menu;
@@ -42,6 +42,7 @@ import org.androidannotations.annotations.EActivity;
 import org.androidannotations.annotations.ViewById;
 import org.autojs.autojs.R;
 import org.autojs.autojs.external.ScriptIntents;
+import org.autojs.autojs.external.receiver.DynamicBroadcastReceivers;
 import org.autojs.autojs.model.script.ScriptFile;
 import org.autojs.autojs.timing.IntentTask;
 import org.autojs.autojs.timing.TaskReceiver;
@@ -75,6 +76,7 @@ public class TimedTaskSettingActivity extends BaseActivity {
 
 
     public static final Map<String, Integer> ACTION_DESC_MAP = new MapBuilder<String, Integer>()
+            .put(DynamicBroadcastReceivers.ACTION_STARTUP, R.string.text_run_on_startup)
             .put(Intent.ACTION_BOOT_COMPLETED, R.string.text_run_on_boot)
             .put(Intent.ACTION_SCREEN_OFF, R.string.text_run_on_screen_off)
             .put(Intent.ACTION_SCREEN_ON, R.string.text_run_on_screen_on)
@@ -92,6 +94,7 @@ public class TimedTaskSettingActivity extends BaseActivity {
             .build();
 
     private static final BiMap<Integer, String> ACTIONS = BiMaps.<Integer, String>newBuilder()
+            .put(R.id.run_on_startup, DynamicBroadcastReceivers.ACTION_STARTUP)
             .put(R.id.run_on_boot, Intent.ACTION_BOOT_COMPLETED)
             .put(R.id.run_on_screen_off, Intent.ACTION_SCREEN_OFF)
             .put(R.id.run_on_screen_on, Intent.ACTION_SCREEN_ON)
@@ -108,7 +111,6 @@ public class TimedTaskSettingActivity extends BaseActivity {
             .put(R.id.run_on_time_tick, Intent.ACTION_TIME_TICK)
             .build();
 
-
     @ViewById(R.id.toolbar)
     Toolbar mToolbar;
 
@@ -343,14 +345,15 @@ public class TimedTaskSettingActivity extends BaseActivity {
         return true;
     }
 
+    @SuppressLint("BatteryLife")
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         if (item.getItemId() == R.id.action_done) {
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M && !((PowerManager) getSystemService(POWER_SERVICE)).isIgnoringBatteryOptimizations(getPackageName())) {
-                try{
+                try {
                     startActivityForResult(new Intent().setAction(Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS)
                             .setData(Uri.parse("package:" + getPackageName())), REQUEST_CODE_IGNORE_BATTERY);
-                }catch(ActivityNotFoundException e){
+                } catch (ActivityNotFoundException e) {
                     e.printStackTrace();
                     createOrUpdateTask();
                 }
@@ -412,6 +415,7 @@ public class TimedTaskSettingActivity extends BaseActivity {
         IntentTask task = new IntentTask();
         task.setAction(action);
         task.setScriptPath(mScriptFile.getPath());
+        task.setLocal(action.equals(DynamicBroadcastReceivers.ACTION_STARTUP));
         if (mIntentTask != null) {
             task.setId(mIntentTask.getId());
             TimedTaskManager.getInstance().updateTask(task);
diff --git a/app/src/main/java/org/autojs/autojs/ui/update/UpdateInfoDialogBuilder.java b/app/src/main/java/org/autojs/autojs/ui/update/UpdateInfoDialogBuilder.java
index 413913e2..8fa166fe 100644
--- a/app/src/main/java/org/autojs/autojs/ui/update/UpdateInfoDialogBuilder.java
+++ b/app/src/main/java/org/autojs/autojs/ui/update/UpdateInfoDialogBuilder.java
@@ -4,7 +4,7 @@ import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.preference.PreferenceManager;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.text.TextUtils;
 import android.view.View;
 import android.widget.Button;
diff --git a/app/src/main/java/org/autojs/autojs/ui/update/VersionGuard.java b/app/src/main/java/org/autojs/autojs/ui/update/VersionGuard.java
index 588ed99c..57796b4a 100644
--- a/app/src/main/java/org/autojs/autojs/ui/update/VersionGuard.java
+++ b/app/src/main/java/org/autojs/autojs/ui/update/VersionGuard.java
@@ -1,8 +1,8 @@
 package org.autojs.autojs.ui.update;
 
 import android.app.Activity;
-import android.content.DialogInterface;
-import android.support.annotation.NonNull;
+
+import androidx.annotation.NonNull;
 
 import com.afollestad.materialdialogs.DialogAction;
 import com.afollestad.materialdialogs.MaterialDialog;
@@ -13,7 +13,6 @@ import org.autojs.autojs.network.entity.VersionInfo;
 import org.autojs.autojs.tool.SimpleObserver;
 
 import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.functions.Consumer;
 
 /**
  * Created by Stardust on 2017/4/12.
diff --git a/app/src/main/java/org/autojs/autojs/ui/user/WebActivity.java b/app/src/main/java/org/autojs/autojs/ui/user/WebActivity.java
index 4cd4d720..28bbb16a 100644
--- a/app/src/main/java/org/autojs/autojs/ui/user/WebActivity.java
+++ b/app/src/main/java/org/autojs/autojs/ui/user/WebActivity.java
@@ -1,7 +1,7 @@
 package org.autojs.autojs.ui.user;
 
 import android.content.Intent;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.stardust.app.OnActivityResultDelegate;
 import org.autojs.autojs.R;
diff --git a/app/src/main/java/org/autojs/autojs/ui/viewmodel/ExplorerItemList.java b/app/src/main/java/org/autojs/autojs/ui/viewmodel/ExplorerItemList.java
index 5e9d4afc..c88abcbb 100644
--- a/app/src/main/java/org/autojs/autojs/ui/viewmodel/ExplorerItemList.java
+++ b/app/src/main/java/org/autojs/autojs/ui/viewmodel/ExplorerItemList.java
@@ -2,6 +2,7 @@ package org.autojs.autojs.ui.viewmodel;
 
 import android.content.SharedPreferences;
 
+import org.autojs.autojs.model.explorer.ExplorerDirPage;
 import org.autojs.autojs.model.explorer.ExplorerItem;
 import org.autojs.autojs.model.explorer.ExplorerPage;
 import org.autojs.autojs.model.explorer.ExplorerSorter;
@@ -145,6 +146,47 @@ public class ExplorerItemList {
         }
     }
 
+    public void insertAtFront(ExplorerItem item) {
+        if (item instanceof ExplorerPage) {
+            mItemGroups.add(0, (ExplorerPage) item);
+        } else {
+            mItems.add(0, item);
+        }
+    }
+
+
+    public int remove(ExplorerItem item) {
+        if (item instanceof ExplorerPage) {
+            return remove(mItemGroups, item);
+        } else {
+            return remove(mItems, item);
+        }
+    }
+
+    public int update(ExplorerItem oldItem, ExplorerItem newItem) {
+        if (oldItem instanceof ExplorerPage) {
+            return update(mItemGroups, (ExplorerPage) oldItem, (ExplorerPage) newItem);
+        } else {
+            return update(mItems, oldItem, newItem);
+        }
+    }
+
+    private <T> int update(ArrayList<T> list, T oldItem, T newItem) {
+        int i = list.indexOf(oldItem);
+        if (i >= 0) {
+            list.set(i, newItem);
+        }
+        return i;
+    }
+
+    private <T> int remove(ArrayList<?> list, T o) {
+        int i = list.indexOf(o);
+        if (i >= 0) {
+            list.remove(i);
+        }
+        return i;
+    }
+
     public ExplorerPage getItemGroup(int i) {
         return mItemGroups.get(i);
     }
diff --git a/app/src/main/java/org/autojs/autojs/ui/widget/AppWithStatusBarLayout.java b/app/src/main/java/org/autojs/autojs/ui/widget/AppWithStatusBarLayout.java
index 237e73bf..4addc273 100644
--- a/app/src/main/java/org/autojs/autojs/ui/widget/AppWithStatusBarLayout.java
+++ b/app/src/main/java/org/autojs/autojs/ui/widget/AppWithStatusBarLayout.java
@@ -5,17 +5,14 @@ import android.content.Context;
 import android.content.ContextWrapper;
 import android.content.res.Configuration;
 import android.graphics.Rect;
-import android.support.annotation.IntDef;
-import android.support.annotation.Nullable;
-import android.support.design.widget.AppBarLayout;
+import androidx.annotation.IntDef;
+import androidx.annotation.Nullable;
+import com.google.android.material.appbar.AppBarLayout;
 import android.util.AttributeSet;
 import android.util.TypedValue;
-import android.view.View;
 import android.view.ViewTreeObserver;
 import android.view.Window;
 
-import com.stardust.util.ViewUtil;
-
 /**
  * Created by Stardust on 2017/8/22.
  */
diff --git a/app/src/main/java/org/autojs/autojs/ui/widget/AutoAdapter.java b/app/src/main/java/org/autojs/autojs/ui/widget/AutoAdapter.java
index 285db8cf..4761b67e 100644
--- a/app/src/main/java/org/autojs/autojs/ui/widget/AutoAdapter.java
+++ b/app/src/main/java/org/autojs/autojs/ui/widget/AutoAdapter.java
@@ -1,10 +1,8 @@
 package org.autojs.autojs.ui.widget;
 
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.ViewGroup;
 
-import org.autojs.autojs.model.indices.ClassSearchingItem;
-
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
diff --git a/app/src/main/java/org/autojs/autojs/ui/widget/AvatarView.java b/app/src/main/java/org/autojs/autojs/ui/widget/AvatarView.java
index 62fbedc1..f5ed2b82 100644
--- a/app/src/main/java/org/autojs/autojs/ui/widget/AvatarView.java
+++ b/app/src/main/java/org/autojs/autojs/ui/widget/AvatarView.java
@@ -2,25 +2,22 @@ package org.autojs.autojs.ui.widget;
 
 import android.content.Context;
 import android.graphics.Color;
-import android.graphics.drawable.Drawable;
 import android.graphics.drawable.GradientDrawable;
-import android.support.annotation.AttrRes;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.AttrRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.view.View;
 import android.widget.FrameLayout;
-import android.widget.ImageView;
 import android.widget.TextView;
 
-
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.load.engine.DiskCacheStrategy;
+import com.bumptech.glide.request.RequestOptions;
 import com.makeramen.roundedimageview.RoundedImageView;
+
 import org.autojs.autojs.R;
-import org.autojs.autojs.network.GlideApp;
-import org.autojs.autojs.network.Glides;
 import org.autojs.autojs.network.NodeBB;
 import org.autojs.autojs.network.entity.user.User;
 
@@ -80,10 +77,12 @@ public class AvatarView extends FrameLayout {
             mIcon.setVisibility(View.VISIBLE);
             mIconText.setVisibility(View.GONE);
             mIcon.setCornerRadius(getWidth() / 2);
-            GlideApp.with(getContext())
+            Glide.with(getContext())
                     .load(NodeBB.BASE_URL + user.getPicture())
-                    .diskCacheStrategy(DiskCacheStrategy.NONE)
-                    .skipMemoryCache(true)
+                    .apply(new RequestOptions()
+                            .diskCacheStrategy(DiskCacheStrategy.NONE)
+                            .skipMemoryCache(true)
+                    )
                     .into(mIcon);
         }
     }
diff --git a/app/src/main/java/org/autojs/autojs/ui/widget/BackgroundTarget.kt b/app/src/main/java/org/autojs/autojs/ui/widget/BackgroundTarget.kt
new file mode 100644
index 00000000..e877898f
--- /dev/null
+++ b/app/src/main/java/org/autojs/autojs/ui/widget/BackgroundTarget.kt
@@ -0,0 +1,25 @@
+package org.autojs.autojs.ui.widget
+
+import android.graphics.drawable.Drawable
+import android.view.View
+import com.bumptech.glide.request.target.CustomViewTarget
+import com.bumptech.glide.request.transition.Transition
+
+class BackgroundTarget(view: View) : CustomViewTarget<View, Drawable>(view) {
+    override fun onLoadFailed(errorDrawable: Drawable?) {
+        errorDrawable?.let {
+            view.background = it
+        }
+    }
+
+    override fun onResourceCleared(placeholder: Drawable?) {
+        placeholder?.let {
+            view.background = it
+        }
+    }
+
+    override fun onResourceReady(resource: Drawable, transition: Transition<in Drawable>?) {
+        view.background = resource
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/autojs/autojs/ui/widget/BindableViewHolder.java b/app/src/main/java/org/autojs/autojs/ui/widget/BindableViewHolder.java
index d2c3e667..f5b828be 100644
--- a/app/src/main/java/org/autojs/autojs/ui/widget/BindableViewHolder.java
+++ b/app/src/main/java/org/autojs/autojs/ui/widget/BindableViewHolder.java
@@ -1,6 +1,6 @@
 package org.autojs.autojs.ui.widget;
 
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.View;
 
 /**
diff --git a/app/src/main/java/org/autojs/autojs/ui/widget/BubblePopupMenu.java b/app/src/main/java/org/autojs/autojs/ui/widget/BubblePopupMenu.java
index 74c5f448..3e007f09 100644
--- a/app/src/main/java/org/autojs/autojs/ui/widget/BubblePopupMenu.java
+++ b/app/src/main/java/org/autojs/autojs/ui/widget/BubblePopupMenu.java
@@ -3,7 +3,7 @@ package org.autojs.autojs.ui.widget;
 import android.content.Context;
 import android.graphics.Color;
 import android.graphics.drawable.ColorDrawable;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.Gravity;
 import android.view.View;
 import android.widget.LinearLayout;
diff --git a/app/src/main/java/org/autojs/autojs/ui/widget/CheckBoxCompat.java b/app/src/main/java/org/autojs/autojs/ui/widget/CheckBoxCompat.java
index aaf0160d..f248a218 100644
--- a/app/src/main/java/org/autojs/autojs/ui/widget/CheckBoxCompat.java
+++ b/app/src/main/java/org/autojs/autojs/ui/widget/CheckBoxCompat.java
@@ -1,7 +1,7 @@
 package org.autojs.autojs.ui.widget;
 
 import android.content.Context;
-import android.support.v7.widget.AppCompatCheckBox;
+import androidx.appcompat.widget.AppCompatCheckBox;
 import android.util.AttributeSet;
 import android.widget.CompoundButton;
 
diff --git a/app/src/main/java/org/autojs/autojs/ui/widget/CommonMarkdownView.java b/app/src/main/java/org/autojs/autojs/ui/widget/CommonMarkdownView.java
index 05b8709f..de9d80fb 100644
--- a/app/src/main/java/org/autojs/autojs/ui/widget/CommonMarkdownView.java
+++ b/app/src/main/java/org/autojs/autojs/ui/widget/CommonMarkdownView.java
@@ -4,8 +4,8 @@ import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Build;
-import android.support.annotation.NonNull;
-import android.support.annotation.RequiresApi;
+import androidx.annotation.NonNull;
+import androidx.annotation.RequiresApi;
 import android.util.AttributeSet;
 import android.webkit.WebResourceRequest;
 import android.webkit.WebView;
diff --git a/app/src/main/java/org/autojs/autojs/ui/widget/EWebView.java b/app/src/main/java/org/autojs/autojs/ui/widget/EWebView.java
index 7340072c..7c0942c4 100644
--- a/app/src/main/java/org/autojs/autojs/ui/widget/EWebView.java
+++ b/app/src/main/java/org/autojs/autojs/ui/widget/EWebView.java
@@ -5,11 +5,13 @@ import android.app.Activity;
 import android.content.ActivityNotFoundException;
 import android.content.Context;
 import android.content.Intent;
+import android.content.pm.ResolveInfo;
 import android.graphics.Bitmap;
 import android.net.Uri;
 import android.os.Build;
-import android.support.annotation.RequiresApi;
-import android.support.v4.widget.SwipeRefreshLayout;
+
+import androidx.annotation.RequiresApi;
+
 import android.util.AttributeSet;
 import android.webkit.ValueCallback;
 import android.webkit.WebChromeClient;
@@ -20,20 +22,17 @@ import android.webkit.WebViewClient;
 import android.widget.FrameLayout;
 import android.widget.ProgressBar;
 
+import com.google.android.material.bottomsheet.BottomSheetDialog;
 import com.stardust.app.OnActivityResultDelegate;
+
 import org.autojs.autojs.R;
 import org.autojs.autojs.tool.ImageSelector;
-import com.stardust.util.IntentUtil;
 
-import org.androidannotations.annotations.OnActivityResult;
-import org.androidannotations.annotations.ViewById;
-
-import java.io.File;
-import java.io.InputStream;
 import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 import io.reactivex.Observable;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 
@@ -66,9 +65,9 @@ public class EWebView extends FrameLayout implements SwipeRefreshLayout.OnRefres
 
     private void init() {
         inflate(getContext(), R.layout.ewebview, this);
-        mWebView = (WebView) findViewById(R.id.web_view);
-        mSwipeRefreshLayout = (SwipeRefreshLayout) findViewById(R.id.swipe_refresh_layout);
-        mProgressBar = (ProgressBar) findViewById(R.id.progress_bar);
+        mWebView = findViewById(R.id.web_view);
+        mSwipeRefreshLayout = findViewById(R.id.swipe_refresh_layout);
+        mProgressBar = findViewById(R.id.progress_bar);
         mSwipeRefreshLayout.setOnRefreshListener(this);
         setUpWebView();
     }
@@ -210,8 +209,13 @@ public class EWebView extends FrameLayout implements SwipeRefreshLayout.OnRefres
             if (url.startsWith("http://") || url.startsWith("https://") || url.startsWith("file://")) {
                 view.loadUrl(url);
             } else {
+                Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(url));
+                List<ResolveInfo> intentActivities = getContext().getPackageManager().queryIntentActivities(intent, 0);
+                if (intentActivities.isEmpty()) {
+                    return false;
+                }
                 try {
-                    getContext().startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(url)));
+                    getContext().startActivity(Intent.createChooser(intent, getResources().getString(R.string.text_open_with)));
                 } catch (ActivityNotFoundException e) {
                     e.printStackTrace();
                     return false;
diff --git a/app/src/main/java/org/autojs/autojs/ui/widget/ExpandableRecyclerView.java b/app/src/main/java/org/autojs/autojs/ui/widget/ExpandableRecyclerView.java
index 2b973343..f61bdc1f 100644
--- a/app/src/main/java/org/autojs/autojs/ui/widget/ExpandableRecyclerView.java
+++ b/app/src/main/java/org/autojs/autojs/ui/widget/ExpandableRecyclerView.java
@@ -1,9 +1,10 @@
 package org.autojs.autojs.ui.widget;
 
 import android.content.Context;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.ThemeColorRecyclerView;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.recyclerview.widget.ThemeColorRecyclerView;
+
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
 import android.view.View;
diff --git a/app/src/main/java/org/autojs/autojs/ui/widget/GridDividerDecoration.java b/app/src/main/java/org/autojs/autojs/ui/widget/GridDividerDecoration.java
index 0d383c6a..d7f6e198 100644
--- a/app/src/main/java/org/autojs/autojs/ui/widget/GridDividerDecoration.java
+++ b/app/src/main/java/org/autojs/autojs/ui/widget/GridDividerDecoration.java
@@ -5,12 +5,11 @@ package org.autojs.autojs.ui.widget;
  */
 
 import android.content.Context;
-import android.content.res.TypedArray;
 import android.graphics.Canvas;
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
-import android.support.v7.widget.RecyclerView;
-import android.util.TypedValue;
+import androidx.recyclerview.widget.RecyclerView;
+
 import android.view.View;
 
 
diff --git a/app/src/main/java/org/autojs/autojs/ui/widget/ItemTouchHelperSimpleCallback.java b/app/src/main/java/org/autojs/autojs/ui/widget/ItemTouchHelperSimpleCallback.java
index d74ace07..1eba36c1 100644
--- a/app/src/main/java/org/autojs/autojs/ui/widget/ItemTouchHelperSimpleCallback.java
+++ b/app/src/main/java/org/autojs/autojs/ui/widget/ItemTouchHelperSimpleCallback.java
@@ -1,7 +1,7 @@
 package org.autojs.autojs.ui.widget;
 
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.helper.ItemTouchHelper;
+import androidx.recyclerview.widget.ItemTouchHelper;
+import androidx.recyclerview.widget.RecyclerView;
 
 /**
  * Created by Stardust on 2017/4/6.
diff --git a/app/src/main/java/org/autojs/autojs/ui/widget/NestedWebView.java b/app/src/main/java/org/autojs/autojs/ui/widget/NestedWebView.java
index 7197d4f1..553f7ecc 100644
--- a/app/src/main/java/org/autojs/autojs/ui/widget/NestedWebView.java
+++ b/app/src/main/java/org/autojs/autojs/ui/widget/NestedWebView.java
@@ -16,10 +16,10 @@ package org.autojs.autojs.ui.widget;/*
 
 
 import android.content.Context;
-import android.support.v4.view.MotionEventCompat;
-import android.support.v4.view.NestedScrollingChild;
-import android.support.v4.view.NestedScrollingChildHelper;
-import android.support.v4.view.ViewCompat;
+import androidx.core.view.MotionEventCompat;
+import androidx.core.view.NestedScrollingChild;
+import androidx.core.view.NestedScrollingChildHelper;
+import androidx.core.view.ViewCompat;
 import android.util.AttributeSet;
 import android.view.MotionEvent;
 import android.webkit.WebView;
diff --git a/app/src/main/java/org/autojs/autojs/ui/widget/OnItemClickListener.java b/app/src/main/java/org/autojs/autojs/ui/widget/OnItemClickListener.java
index 3f81384a..88b13a59 100644
--- a/app/src/main/java/org/autojs/autojs/ui/widget/OnItemClickListener.java
+++ b/app/src/main/java/org/autojs/autojs/ui/widget/OnItemClickListener.java
@@ -1,6 +1,6 @@
 package org.autojs.autojs.ui.widget;
 
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.View;
 
 /**
diff --git a/app/src/main/java/org/autojs/autojs/ui/widget/PrefSwitch.java b/app/src/main/java/org/autojs/autojs/ui/widget/PrefSwitch.java
index c8396a89..bb85fa56 100644
--- a/app/src/main/java/org/autojs/autojs/ui/widget/PrefSwitch.java
+++ b/app/src/main/java/org/autojs/autojs/ui/widget/PrefSwitch.java
@@ -6,13 +6,18 @@ import android.content.res.TypedArray;
 import android.preference.PreferenceManager;
 import android.util.AttributeSet;
 
+import com.stardust.theme.ThemeColor;
+import com.stardust.theme.ThemeColorHelper;
+import com.stardust.theme.ThemeColorManager;
+import com.stardust.theme.ThemeColorMutable;
+
 import org.autojs.autojs.R;
 
 /**
  * Created by Stardust on 2017/8/6.
  */
 
-public class PrefSwitch extends SwitchCompat implements SharedPreferences.OnSharedPreferenceChangeListener {
+public class PrefSwitch extends SwitchCompat implements SharedPreferences.OnSharedPreferenceChangeListener, ThemeColorMutable {
 
     private String mPrefKey;
     private SharedPreferences mSharedPreferences;
@@ -47,6 +52,11 @@ public class PrefSwitch extends SwitchCompat implements SharedPreferences.OnShar
             setChecked(mDefaultChecked, false);
         }
         a.recycle();
+        ThemeColorManager.add(this);
+    }
+
+    public void setThemeColor(ThemeColor color) {
+        ThemeColorHelper.setColorPrimary(this, color.colorPrimary);
     }
 
     private void readInitialState() {
@@ -99,6 +109,7 @@ public class PrefSwitch extends SwitchCompat implements SharedPreferences.OnShar
         if (visibility == VISIBLE) {
             readInitialState();
         }
+
     }
 }
 
diff --git a/app/src/main/java/org/autojs/autojs/ui/widget/ScrollAwareFABBehavior.java b/app/src/main/java/org/autojs/autojs/ui/widget/ScrollAwareFABBehavior.java
index b5cce217..7a2c1088 100644
--- a/app/src/main/java/org/autojs/autojs/ui/widget/ScrollAwareFABBehavior.java
+++ b/app/src/main/java/org/autojs/autojs/ui/widget/ScrollAwareFABBehavior.java
@@ -4,9 +4,10 @@ import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.animation.TimeInterpolator;
 import android.content.Context;
-import android.support.design.widget.CoordinatorLayout;
-import android.support.design.widget.FloatingActionButton;
-import android.support.v4.view.animation.FastOutSlowInInterpolator;
+import androidx.coordinatorlayout.widget.CoordinatorLayout;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+
+import androidx.interpolator.view.animation.FastOutSlowInInterpolator;
 import android.util.AttributeSet;
 import android.view.View;
 
diff --git a/app/src/main/java/org/autojs/autojs/ui/widget/SearchViewItem.java b/app/src/main/java/org/autojs/autojs/ui/widget/SearchViewItem.java
index 76e2329b..d574e19c 100644
--- a/app/src/main/java/org/autojs/autojs/ui/widget/SearchViewItem.java
+++ b/app/src/main/java/org/autojs/autojs/ui/widget/SearchViewItem.java
@@ -3,12 +3,10 @@ package org.autojs.autojs.ui.widget;
 import android.app.Activity;
 import android.app.SearchManager;
 import android.content.Context;
-import android.support.v4.view.MenuItemCompat;
-import android.support.v7.widget.SearchView;
+import androidx.core.view.MenuItemCompat;
+import androidx.appcompat.widget.SearchView;
 import android.view.MenuItem;
 
-import org.autojs.autojs.ui.main.MainActivity;
-
 /**
  * Created by Stardust on 2017/10/25.
  */
diff --git a/app/src/main/java/org/autojs/autojs/ui/widget/SimpleAdapterDataObserver.java b/app/src/main/java/org/autojs/autojs/ui/widget/SimpleAdapterDataObserver.java
index 65e01347..daff64fb 100644
--- a/app/src/main/java/org/autojs/autojs/ui/widget/SimpleAdapterDataObserver.java
+++ b/app/src/main/java/org/autojs/autojs/ui/widget/SimpleAdapterDataObserver.java
@@ -1,6 +1,6 @@
 package org.autojs.autojs.ui.widget;
 
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 
 /**
  * Created by Stardust on 2017/3/14.
diff --git a/app/src/main/java/org/autojs/autojs/ui/widget/SimpleRecyclerViewAdapter.java b/app/src/main/java/org/autojs/autojs/ui/widget/SimpleRecyclerViewAdapter.java
index 03ddbab2..1e5a94bd 100644
--- a/app/src/main/java/org/autojs/autojs/ui/widget/SimpleRecyclerViewAdapter.java
+++ b/app/src/main/java/org/autojs/autojs/ui/widget/SimpleRecyclerViewAdapter.java
@@ -1,6 +1,6 @@
 package org.autojs.autojs.ui.widget;
 
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/app/src/main/java/org/autojs/autojs/ui/widget/SwitchCompat.java b/app/src/main/java/org/autojs/autojs/ui/widget/SwitchCompat.java
index 55528fb7..b8af035f 100644
--- a/app/src/main/java/org/autojs/autojs/ui/widget/SwitchCompat.java
+++ b/app/src/main/java/org/autojs/autojs/ui/widget/SwitchCompat.java
@@ -2,13 +2,12 @@ package org.autojs.autojs.ui.widget;
 
 import android.content.Context;
 import android.util.AttributeSet;
-import android.widget.CompoundButton;
 
 /**
  * Created by Stardust on 2017/9/18.
  */
 
-public class SwitchCompat extends android.support.v7.widget.SwitchCompat {
+public class SwitchCompat extends androidx.appcompat.widget.SwitchCompat {
 
     private boolean mIgnoreCheckedChange = false;
 
@@ -27,14 +26,11 @@ public class SwitchCompat extends android.support.v7.widget.SwitchCompat {
 
     @Override
     public void setOnCheckedChangeListener(final OnCheckedChangeListener listener) {
-        super.setOnCheckedChangeListener(new OnCheckedChangeListener() {
-            @Override
-            public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-                if (mIgnoreCheckedChange) {
-                    return;
-                }
-                listener.onCheckedChanged(buttonView, isChecked);
+        super.setOnCheckedChangeListener((buttonView, isChecked) -> {
+            if (mIgnoreCheckedChange) {
+                return;
             }
+            listener.onCheckedChanged(buttonView, isChecked);
         });
     }
 
diff --git a/app/src/main/java/org/autojs/autojs/ui/widget/ToolbarMenuItem.java b/app/src/main/java/org/autojs/autojs/ui/widget/ToolbarMenuItem.java
index 4d813ab6..593f9445 100644
--- a/app/src/main/java/org/autojs/autojs/ui/widget/ToolbarMenuItem.java
+++ b/app/src/main/java/org/autojs/autojs/ui/widget/ToolbarMenuItem.java
@@ -7,6 +7,7 @@ import android.graphics.Color;
 import android.graphics.PorterDuff;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
+import androidx.core.content.ContextCompat;
 import android.util.AttributeSet;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
@@ -20,24 +21,31 @@ import org.autojs.autojs.R;
 
 public class ToolbarMenuItem extends LinearLayout {
 
-    private static final int COLOR_DISABLED = 0X77e0e0e0;
+    private final int mColorDisabled;
+    private final int mColorEnabled;
     private ImageView mImageView;
     private TextView mTextView;
     private Drawable mEnabledDrawable, mDisabledDrawable;
 
     public ToolbarMenuItem(Context context, AttributeSet attrs) {
         super(context, attrs);
+        mColorDisabled = ContextCompat.getColor(context, R.color.toolbar_disabled);
+        mColorEnabled = ContextCompat.getColor(context, R.color.toolbar);
         init(attrs);
     }
 
     public ToolbarMenuItem(Context context, AttributeSet attrs, int defStyleAttr) {
         super(context, attrs, defStyleAttr);
+        mColorDisabled = ContextCompat.getColor(context, R.color.toolbar_disabled);
+        mColorEnabled = ContextCompat.getColor(context, R.color.toolbar);
         init(attrs);
     }
 
     @TargetApi(Build.VERSION_CODES.LOLLIPOP)
     public ToolbarMenuItem(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
         super(context, attrs, defStyleAttr, defStyleRes);
+        mColorDisabled = ContextCompat.getColor(context, R.color.toolbar_disabled);
+        mColorEnabled = ContextCompat.getColor(context, R.color.toolbar);
         init(attrs);
     }
 
@@ -48,12 +56,13 @@ public class ToolbarMenuItem extends LinearLayout {
         int iconResId = a.getResourceId(R.styleable.ToolbarMenuItem_icon, 0);
         int iconColor = a.getColor(R.styleable.ToolbarMenuItem_icon_color, Color.TRANSPARENT);
         a.recycle();
-        mImageView = (ImageView) findViewById(R.id.icon);
-        mTextView = (TextView) findViewById(R.id.text);
+        mImageView = findViewById(R.id.icon);
+        mTextView = findViewById(R.id.text);
         mTextView.setText(text);
+        mTextView.setTextColor(mColorEnabled);
         mImageView.setImageResource(iconResId);
         if (iconColor != Color.TRANSPARENT) {
-            mImageView.setImageDrawable(convertDrawableToGrayScale(mImageView.getDrawable(), iconColor));
+            mImageView.setImageDrawable(tintDrawable(mImageView.getDrawable(), iconColor));
         }
     }
 
@@ -65,12 +74,12 @@ public class ToolbarMenuItem extends LinearLayout {
         ensureEnabledDrawable();
         ensureDisabledDrawable();
         mImageView.setImageDrawable(enabled ? mEnabledDrawable : mDisabledDrawable);
-        mTextView.setTextColor(enabled ? Color.WHITE : COLOR_DISABLED);
+        mTextView.setTextColor(enabled ? mColorEnabled : mColorDisabled);
     }
 
     private void ensureDisabledDrawable() {
         if (mDisabledDrawable == null) {
-            mDisabledDrawable = convertDrawableToGrayScale(mEnabledDrawable, COLOR_DISABLED);
+            mDisabledDrawable = tintDrawable(mEnabledDrawable, mColorDisabled);
         }
     }
 
@@ -80,7 +89,7 @@ public class ToolbarMenuItem extends LinearLayout {
         }
     }
 
-    public static Drawable convertDrawableToGrayScale(Drawable drawable, int color) {
+    public static Drawable tintDrawable(Drawable drawable, int color) {
         if (drawable == null || drawable.getConstantState() == null)
             return null;
         Drawable res = drawable.getConstantState().newDrawable().mutate();
diff --git a/app/src/main/java/org/autojs/autojs/ui/widget/ViewHolderMutableAdapter.java b/app/src/main/java/org/autojs/autojs/ui/widget/ViewHolderMutableAdapter.java
index 07317872..03449b1b 100644
--- a/app/src/main/java/org/autojs/autojs/ui/widget/ViewHolderMutableAdapter.java
+++ b/app/src/main/java/org/autojs/autojs/ui/widget/ViewHolderMutableAdapter.java
@@ -1,6 +1,6 @@
 package org.autojs.autojs.ui.widget;
 
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.ViewGroup;
 
 /**
diff --git a/app/src/main/java/org/autojs/autojs/ui/widget/ViewHolderSupplier.java b/app/src/main/java/org/autojs/autojs/ui/widget/ViewHolderSupplier.java
index 6178ac27..c9bc4c09 100644
--- a/app/src/main/java/org/autojs/autojs/ui/widget/ViewHolderSupplier.java
+++ b/app/src/main/java/org/autojs/autojs/ui/widget/ViewHolderSupplier.java
@@ -1,6 +1,6 @@
 package org.autojs.autojs.ui.widget;
 
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/app/src/main/java/org/autojs/autojs/workground/WrapContentGridLayoutManger.java b/app/src/main/java/org/autojs/autojs/workground/WrapContentGridLayoutManger.java
index a8045f8d..013448c2 100644
--- a/app/src/main/java/org/autojs/autojs/workground/WrapContentGridLayoutManger.java
+++ b/app/src/main/java/org/autojs/autojs/workground/WrapContentGridLayoutManger.java
@@ -1,10 +1,9 @@
 package org.autojs.autojs.workground;
 
 import android.content.Context;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import android.util.AttributeSet;
-import android.util.Log;
 
 import com.tencent.bugly.crashreport.BuglyLog;
 
diff --git a/app/src/main/res/drawable-xhdpi/ic_build_apk.png b/app/src/main/res/drawable-xhdpi/ic_build_apk.png
new file mode 100644
index 00000000..35067a65
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_build_apk.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_night_mode.png b/app/src/main/res/drawable-xhdpi/ic_night_mode.png
new file mode 100644
index 00000000..a45978bc
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_night_mode.png differ
diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml
index 00f7bf03..e5fb4498 100644
--- a/app/src/main/res/layout/activity_about.xml
+++ b/app/src/main/res/layout/activity_about.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout
+<androidx.coordinatorlayout.widget.CoordinatorLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
@@ -13,7 +13,7 @@
         android:orientation="vertical">
 
 
-        <android.support.design.widget.AppBarLayout
+        <com.google.android.material.appbar.AppBarLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             app:theme="@style/AppTheme.AppBarOverlay">
@@ -23,10 +23,11 @@
                 android:layout_width="match_parent"
                 android:layout_height="?attr/actionBarSize"
                 android:background="?attr/colorPrimary"
+                android:theme="@style/ToolBarStyle"
                 app:popupTheme="@style/AppTheme.PopupOverlay"
                 app:title="@string/text_about"/>
 
-        </android.support.design.widget.AppBarLayout>
+        </com.google.android.material.appbar.AppBarLayout>
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -91,4 +92,4 @@
         app:layout_anchor="@id/icon_container"
         app:layout_anchorGravity="bottom|right|end"/>
 
-</android.support.design.widget.CoordinatorLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/activity_build.xml b/app/src/main/res/layout/activity_build.xml
index a55797cb..4acdc1fd 100644
--- a/app/src/main/res/layout/activity_build.xml
+++ b/app/src/main/res/layout/activity_build.xml
@@ -5,7 +5,7 @@
               android:layout_height="match_parent"
               android:orientation="vertical">
 
-    <android.support.design.widget.AppBarLayout
+    <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:theme="@style/AppTheme.AppBarOverlay">
@@ -13,9 +13,10 @@
         <com.stardust.theme.widget.ThemeColorToolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"/>
+            android:layout_height="wrap_content"
+            android:theme="@style/ToolBarStyle"/>
 
-    </android.support.design.widget.AppBarLayout>
+    </com.google.android.material.appbar.AppBarLayout>
 
 
     <FrameLayout
@@ -32,12 +33,11 @@
                 android:layout_height="wrap_content"
                 android:orientation="vertical">
 
-                <android.support.v7.widget.CardView
+                <androidx.cardview.widget.CardView
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="6dp"
                     android:layout_marginRight="6dp"
-                    app:cardBackgroundColor="@android:color/white"
                     app:cardCornerRadius="2dp"
                     app:cardElevation="1dp"
                     app:cardUseCompatPadding="true">
@@ -62,20 +62,21 @@
                             android:layout_height="wrap_content"
                             android:orientation="horizontal">
 
-                            <android.support.design.widget.TextInputLayout
+                            <com.google.android.material.textfield.TextInputLayout
                                 android:layout_width="0dp"
                                 android:layout_height="wrap_content"
-                                android:layout_weight="1">
+                                android:layout_weight="1"
+                                android:hint="@string/text_source_file_path">
 
-                                <android.support.design.widget.TextInputEditText
+                                <androidx.appcompat.widget.AppCompatEditText
                                     android:id="@+id/source_path"
                                     android:layout_width="match_parent"
                                     android:layout_height="wrap_content"
-                                    android:hint="@string/text_source_file_path"/>
+                                    />
 
-                            </android.support.design.widget.TextInputLayout>
+                            </com.google.android.material.textfield.TextInputLayout>
 
-                            <android.support.v7.widget.AppCompatButton
+                            <androidx.appcompat.widget.AppCompatButton
                                 android:id="@+id/select_source"
                                 style="@style/Base.Widget.AppCompat.Button.Borderless.Colored"
                                 android:layout_width="60dp"
@@ -91,20 +92,21 @@
                             android:layout_marginTop="12dp"
                             android:orientation="horizontal">
 
-                            <android.support.design.widget.TextInputLayout
+                            <com.google.android.material.textfield.TextInputLayout
                                 android:layout_width="0dp"
                                 android:layout_height="wrap_content"
-                                android:layout_weight="1">
+                                android:layout_weight="1"
+                                android:hint="@string/text_output_apk_path">
 
-                                <android.support.design.widget.TextInputEditText
+                                <androidx.appcompat.widget.AppCompatEditText
                                     android:id="@+id/output_path"
                                     android:layout_width="match_parent"
                                     android:layout_height="wrap_content"
-                                    android:hint="@string/text_output_apk_path"/>
+                                    />
 
-                            </android.support.design.widget.TextInputLayout>
+                            </com.google.android.material.textfield.TextInputLayout>
 
-                            <android.support.v7.widget.AppCompatButton
+                            <androidx.appcompat.widget.AppCompatButton
                                 android:id="@+id/select_output"
                                 style="@style/Base.Widget.AppCompat.Button.Borderless.Colored"
                                 android:layout_width="60dp"
@@ -114,9 +116,9 @@
                         </LinearLayout>
                     </LinearLayout>
 
-                </android.support.v7.widget.CardView>
+                </androidx.cardview.widget.CardView>
 
-                <android.support.v7.widget.CardView
+                <androidx.cardview.widget.CardView
                     android:id="@+id/app_config"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -140,29 +142,29 @@
                             android:textAppearance="@style/TextAppearance.AppCompat.Body2"
                             android:textColor="?android:textColorSecondary"/>
 
-                        <android.support.design.widget.TextInputLayout
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content">
-
-                            <android.support.design.widget.TextInputEditText
-                                android:id="@+id/app_name"
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:hint="@string/text_app_name"/>
-                        </android.support.design.widget.TextInputLayout>
-
-                        <android.support.design.widget.TextInputLayout
+                        <com.google.android.material.textfield.TextInputLayout
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:layout_marginTop="12dp">
+                            android:hint="@string/text_app_name">
 
-                            <android.support.design.widget.TextInputEditText
+                            <androidx.appcompat.widget.AppCompatEditText
+                                android:id="@+id/app_name"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"/>
+                        </com.google.android.material.textfield.TextInputLayout>
+
+                        <com.google.android.material.textfield.TextInputLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="12dp"
+                            android:hint="@string/text_package_name">
+
+                            <androidx.appcompat.widget.AppCompatEditText
                                 android:id="@+id/package_name"
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
-                                android:digits="abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890_."
-                                android:hint="@string/text_package_name"/>
-                        </android.support.design.widget.TextInputLayout>
+                                android:digits="abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890_."/>
+                        </com.google.android.material.textfield.TextInputLayout>
 
                         <LinearLayout
                             android:layout_width="match_parent"
@@ -175,32 +177,34 @@
                                 android:layout_weight="1"
                                 android:orientation="vertical">
 
-                                <android.support.design.widget.TextInputLayout
+                                <com.google.android.material.textfield.TextInputLayout
                                     android:layout_width="match_parent"
                                     android:layout_height="wrap_content"
-                                    android:layout_marginTop="12dp">
+                                    android:layout_marginTop="12dp"
+                                    android:hint="@string/text_version_name">
 
-                                    <android.support.design.widget.TextInputEditText
+                                    <androidx.appcompat.widget.AppCompatEditText
                                         android:id="@+id/version_name"
                                         android:layout_width="match_parent"
                                         android:layout_height="wrap_content"
-                                        android:hint="@string/text_version_name"
-                                        android:text="1.0.0"/>
-                                </android.support.design.widget.TextInputLayout>
 
-                                <android.support.design.widget.TextInputLayout
+                                        android:text="1.0.0"/>
+                                </com.google.android.material.textfield.TextInputLayout>
+
+                                <com.google.android.material.textfield.TextInputLayout
                                     android:layout_width="match_parent"
                                     android:layout_height="wrap_content"
-                                    android:layout_marginTop="12dp">
+                                    android:layout_marginTop="12dp"
+                                    android:hint="@string/text_version_code">
 
-                                    <android.support.design.widget.TextInputEditText
+                                    <androidx.appcompat.widget.AppCompatEditText
                                         android:id="@+id/version_code"
                                         android:layout_width="match_parent"
                                         android:layout_height="wrap_content"
-                                        android:hint="@string/text_version_code"
+
                                         android:inputType="number"
                                         android:text="1"/>
-                                </android.support.design.widget.TextInputLayout>
+                                </com.google.android.material.textfield.TextInputLayout>
                             </LinearLayout>
 
                             <LinearLayout
@@ -211,8 +215,8 @@
                                 <TextView
                                     android:layout_width="match_parent"
                                     android:layout_height="wrap_content"
-                                    android:layout_marginBottom="12dp"
                                     android:layout_marginTop="12dp"
+                                    android:layout_marginBottom="12dp"
                                     android:text="@string/text_icon"
                                     android:textColor="#9e9e9e"
                                     android:textSize="12sp"/>
@@ -234,7 +238,7 @@
 
                     </LinearLayout>
 
-                </android.support.v7.widget.CardView>
+                </androidx.cardview.widget.CardView>
             </LinearLayout>
         </ScrollView>
 
diff --git a/app/src/main/res/layout/activity_documentation.xml b/app/src/main/res/layout/activity_documentation.xml
index 1aa5bf92..8b855b4a 100644
--- a/app/src/main/res/layout/activity_documentation.xml
+++ b/app/src/main/res/layout/activity_documentation.xml
@@ -6,7 +6,7 @@
               android:fitsSystemWindows="true"
               android:orientation="vertical">
 
-    <android.support.design.widget.AppBarLayout
+    <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:theme="@style/AppTheme.AppBarOverlay">
@@ -15,10 +15,11 @@
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
+            android:theme="@style/ToolBarStyle"
             android:background="?attr/colorPrimary"
             app:popupTheme="@style/AppTheme.PopupOverlay"/>
 
-    </android.support.design.widget.AppBarLayout>
+    </com.google.android.material.appbar.AppBarLayout>
 
     <org.autojs.autojs.ui.widget.EWebView
         android:id="@+id/eweb_view"
diff --git a/app/src/main/res/layout/activity_error_report.xml b/app/src/main/res/layout/activity_error_report.xml
index 993b20d6..dd5a6065 100644
--- a/app/src/main/res/layout/activity_error_report.xml
+++ b/app/src/main/res/layout/activity_error_report.xml
@@ -6,20 +6,21 @@
               android:layout_height="match_parent"
               android:orientation="vertical">
 
-    <android.support.design.widget.AppBarLayout
+    <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:theme="@style/AppTheme.AppBarOverlay">
 
         <com.stardust.theme.widget.ThemeColorToolbar
             android:id="@+id/toolbar"
+            android:theme="@style/ToolBarStyle"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
             android:background="?attr/colorPrimary"
             app:popupTheme="@style/AppTheme.PopupOverlay">
 
         </com.stardust.theme.widget.ThemeColorToolbar>
-    </android.support.design.widget.AppBarLayout>
+    </com.google.android.material.appbar.AppBarLayout>
 
     <TextView
         android:id="@+id/error"
diff --git a/app/src/main/res/layout/activity_log.xml b/app/src/main/res/layout/activity_log.xml
index bd900752..a9464fcf 100644
--- a/app/src/main/res/layout/activity_log.xml
+++ b/app/src/main/res/layout/activity_log.xml
@@ -6,7 +6,7 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <android.support.design.widget.AppBarLayout
+    <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:theme="@style/AppTheme.AppBarOverlay">
@@ -16,9 +16,10 @@
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
             android:background="?attr/colorPrimary"
+            android:theme="@style/ToolBarStyle"
             app:popupTheme="@style/AppTheme.PopupOverlay"/>
 
-    </android.support.design.widget.AppBarLayout>
+    </com.google.android.material.appbar.AppBarLayout>
 
     <FrameLayout
         android:layout_width="match_parent"
@@ -28,9 +29,11 @@
         <com.stardust.autojs.core.console.ConsoleView
             android:id="@+id/console"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"/>
+            android:layout_height="match_parent"
+            app:color_debug="@color/console_debug"
+            app:color_verbose="@color/console_verbose"/>
 
-        <android.support.design.widget.FloatingActionButton
+        <com.stardust.theme.widget.ThemeColorFloatingActionButton
             android:id="@+id/fab"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index f72d9e6b..29c7be77 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -10,7 +10,7 @@
         android:layout_height="wrap_content"
         android:orientation="vertical">
 
-        <android.support.design.widget.AppBarLayout
+        <com.google.android.material.appbar.AppBarLayout
             android:id="@+id/app_bar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -20,45 +20,47 @@
                 android:id="@+id/toolbar"
                 android:layout_width="match_parent"
                 android:layout_height="?attr/actionBarSize"
+                android:theme="@style/ToolBarStyle"
                 android:title="@string/text_login"
                 app:layout_scrollFlags="scroll|enterAlways"
                 app:popupTheme="@style/AppTheme.PopupOverlay"/>
 
-        </android.support.design.widget.AppBarLayout>
+        </com.google.android.material.appbar.AppBarLayout>
 
 
-        <android.support.design.widget.TextInputLayout
+        <com.google.android.material.textfield.TextInputLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="8dp"
             android:layout_marginLeft="8dp"
+            android:layout_marginTop="12dp"
             android:layout_marginRight="8dp"
-            android:layout_marginTop="12dp">
+            android:layout_marginBottom="8dp"
+            android:hint="@string/text_username">
 
-            <android.support.design.widget.TextInputEditText
+            <androidx.appcompat.widget.AppCompatEditText
                 android:id="@+id/username"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:hint="@string/text_username"
-                android:textColor="#dd000000"/>
 
-        </android.support.design.widget.TextInputLayout>
+                android:textColor="?android:textColorPrimary"/>
 
-        <android.support.design.widget.TextInputLayout
+        </com.google.android.material.textfield.TextInputLayout>
+
+        <com.google.android.material.textfield.TextInputLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginLeft="8dp"
-            android:layout_marginRight="8dp">
+            android:layout_marginRight="8dp"
+            android:hint="@string/text_password">
 
-            <android.support.design.widget.TextInputEditText
+            <androidx.appcompat.widget.AppCompatEditText
                 android:id="@+id/password"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:hint="@string/text_password"
                 android:inputType="textPassword"
-                android:textColor="#dd000000"/>
+                android:textColor="?android:textColorPrimary"/>
 
-        </android.support.design.widget.TextInputLayout>
+        </com.google.android.material.textfield.TextInputLayout>
 
         <LinearLayout
             android:id="@+id/forgot_password"
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 8cf59738..8ada97c4 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,44 +1,47 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                                        xmlns:app="http://schemas.android.com/apk/res-auto"
-                                        xmlns:tools="http://schemas.android.com/tools"
-                                        android:id="@+id/drawer_layout"
-                                        android:layout_width="match_parent"
-                                        android:layout_height="match_parent"
-                                        tools:context="org.autojs.autojs.ui.main.MainActivity">
+<androidx.drawerlayout.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                                   xmlns:app="http://schemas.android.com/apk/res-auto"
+                                   xmlns:tools="http://schemas.android.com/tools"
+                                   android:id="@+id/drawer_layout"
+                                   android:layout_width="match_parent"
+                                   android:layout_height="match_parent"
+                                   tools:context="org.autojs.autojs.ui.main.MainActivity">
 
 
-    <android.support.design.widget.CoordinatorLayout
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:clipChildren="false"
         android:clipToPadding="false">
 
-        <android.support.design.widget.AppBarLayout
+        <com.google.android.material.appbar.AppBarLayout
             android:id="@+id/app_bar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:paddingTop="16dp"
             android:theme="@style/AppTheme.AppBarOverlay">
 
-            <android.support.v7.widget.Toolbar
+            <androidx.appcompat.widget.Toolbar
                 android:id="@+id/toolbar"
                 android:layout_width="match_parent"
                 android:layout_height="?attr/actionBarSize"
-                android:title="@string/_app_name"
+                android:theme="@style/ToolBarStyle"
+                android:title="@string/app_name"
                 app:layout_scrollFlags="scroll|enterAlways"
                 app:popupTheme="@style/AppTheme.PopupOverlay"/>
 
-            <android.support.design.widget.TabLayout
+            <com.google.android.material.tabs.TabLayout
                 android:id="@+id/tab"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 app:tabGravity="fill"
-                app:tabIndicatorColor="@android:color/white"
-                app:tabMode="scrollable"/>
-        </android.support.design.widget.AppBarLayout>
+                app:tabIndicatorColor="@color/tab_indicator"
+                app:tabMode="scrollable"
+                app:tabSelectedTextColor="@color/tab_indicator"
+                app:tabTextColor="@color/tab_text"/>
+        </com.google.android.material.appbar.AppBarLayout>
 
-        <android.support.v4.view.ViewPager
+        <androidx.viewpager.widget.ViewPager
             android:id="@+id/viewpager"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
@@ -68,7 +71,7 @@
             app:layout_anchor="@id/viewpager"
             app:layout_anchorGravity="bottom|right|end"/>
 
-    </android.support.design.widget.CoordinatorLayout>
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
     <fragment
         android:id="@+id/fragment_drawer"
@@ -78,5 +81,5 @@
         android:layout_gravity="start"
         android:fitsSystemWindows="false"/>
 
-</android.support.v4.widget.DrawerLayout>
+</androidx.drawerlayout.widget.DrawerLayout>
 
diff --git a/app/src/main/res/layout/activity_project_config.xml b/app/src/main/res/layout/activity_project_config.xml
index 80f0990e..6ae33edd 100644
--- a/app/src/main/res/layout/activity_project_config.xml
+++ b/app/src/main/res/layout/activity_project_config.xml
@@ -5,7 +5,7 @@
               android:layout_height="match_parent"
               android:orientation="vertical">
 
-    <android.support.design.widget.AppBarLayout
+    <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:theme="@style/AppTheme.AppBarOverlay">
@@ -13,9 +13,10 @@
         <com.stardust.theme.widget.ThemeColorToolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"/>
+            android:layout_height="wrap_content"
+            android:theme="@style/ToolBarStyle"/>
 
-    </android.support.design.widget.AppBarLayout>
+    </com.google.android.material.appbar.AppBarLayout>
 
 
     <FrameLayout
@@ -32,7 +33,7 @@
                 android:layout_height="wrap_content"
                 android:orientation="vertical">
 
-                <android.support.v7.widget.CardView
+                <androidx.cardview.widget.CardView
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="6dp"
@@ -55,29 +56,29 @@
                             android:textAppearance="@style/TextAppearance.AppCompat.Body2"
                             android:textColor="?android:textColorSecondary"/>
 
-                        <android.support.design.widget.TextInputLayout
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content">
-
-                            <android.support.design.widget.TextInputEditText
-                                android:id="@+id/app_name"
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:hint="@string/text_app_name"/>
-                        </android.support.design.widget.TextInputLayout>
-
-                        <android.support.design.widget.TextInputLayout
+                        <com.google.android.material.textfield.TextInputLayout
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:layout_marginTop="12dp">
+                            android:hint="@string/text_app_name">
 
-                            <android.support.design.widget.TextInputEditText
+                            <androidx.appcompat.widget.AppCompatEditText
+                                android:id="@+id/app_name"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"/>
+                        </com.google.android.material.textfield.TextInputLayout>
+
+                        <com.google.android.material.textfield.TextInputLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="12dp"
+                            android:hint="@string/text_package_name">
+
+                            <androidx.appcompat.widget.AppCompatEditText
                                 android:id="@+id/package_name"
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
-                                android:digits="abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890_."
-                                android:hint="@string/text_package_name"/>
-                        </android.support.design.widget.TextInputLayout>
+                                android:digits="abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890_."/>
+                        </com.google.android.material.textfield.TextInputLayout>
 
                         <LinearLayout
                             android:layout_width="match_parent"
@@ -90,32 +91,33 @@
                                 android:layout_weight="1"
                                 android:orientation="vertical">
 
-                                <android.support.design.widget.TextInputLayout
+                                <com.google.android.material.textfield.TextInputLayout
                                     android:layout_width="match_parent"
                                     android:layout_height="wrap_content"
-                                    android:layout_marginTop="12dp">
+                                    android:layout_marginTop="12dp"
+                                    android:hint="@string/text_version_name">
 
-                                    <android.support.design.widget.TextInputEditText
+                                    <androidx.appcompat.widget.AppCompatEditText
                                         android:id="@+id/version_name"
                                         android:layout_width="match_parent"
                                         android:layout_height="wrap_content"
-                                        android:hint="@string/text_version_name"
-                                        android:text="1.0.0"/>
-                                </android.support.design.widget.TextInputLayout>
 
-                                <android.support.design.widget.TextInputLayout
+                                        android:text="1.0.0"/>
+                                </com.google.android.material.textfield.TextInputLayout>
+
+                                <com.google.android.material.textfield.TextInputLayout
                                     android:layout_width="match_parent"
                                     android:layout_height="wrap_content"
-                                    android:layout_marginTop="12dp">
+                                    android:layout_marginTop="12dp"
+                                    android:hint="@string/text_version_code">
 
-                                    <android.support.design.widget.TextInputEditText
+                                    <androidx.appcompat.widget.AppCompatEditText
                                         android:id="@+id/version_code"
                                         android:layout_width="match_parent"
                                         android:layout_height="wrap_content"
-                                        android:hint="@string/text_version_code"
                                         android:inputType="number"
                                         android:text="1"/>
-                                </android.support.design.widget.TextInputLayout>
+                                </com.google.android.material.textfield.TextInputLayout>
                             </LinearLayout>
 
                             <LinearLayout
@@ -126,8 +128,8 @@
                                 <TextView
                                     android:layout_width="match_parent"
                                     android:layout_height="wrap_content"
-                                    android:layout_marginBottom="12dp"
                                     android:layout_marginTop="12dp"
+                                    android:layout_marginBottom="12dp"
                                     android:text="@string/text_icon"
                                     android:textColor="#9e9e9e"
                                     android:textSize="12sp"/>
@@ -146,28 +148,27 @@
 
                         </LinearLayout>
 
-                        <android.support.design.widget.TextInputLayout
+                        <com.google.android.material.textfield.TextInputLayout
                             android:layout_width="match_parent"
-                            android:layout_height="wrap_content">
+                            android:layout_height="wrap_content"
+                            android:hint="@string/text_project_location">
 
-                            <android.support.design.widget.TextInputEditText
+                            <androidx.appcompat.widget.AppCompatEditText
                                 android:id="@+id/project_location"
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
-                                android:hint="@string/text_project_location"
                                 android:inputType="number"/>
-                        </android.support.design.widget.TextInputLayout>
+                        </com.google.android.material.textfield.TextInputLayout>
 
                     </LinearLayout>
 
-                </android.support.v7.widget.CardView>
+                </androidx.cardview.widget.CardView>
 
-                <android.support.v7.widget.CardView
+                <androidx.cardview.widget.CardView
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="6dp"
                     android:layout_marginRight="6dp"
-                    app:cardBackgroundColor="@android:color/white"
                     app:cardCornerRadius="2dp"
                     app:cardElevation="1dp"
                     app:cardUseCompatPadding="true">
@@ -186,28 +187,28 @@
                             android:textAppearance="@style/TextAppearance.AppCompat.Body2"
                             android:textColor="?android:textColorSecondary"/>
 
-                        <android.support.design.widget.TextInputLayout
+                        <com.google.android.material.textfield.TextInputLayout
                             android:layout_width="match_parent"
-                            android:layout_height="wrap_content">
+                            android:layout_height="wrap_content"
+                            android:hint="@string/text_main_file_name">
 
-                            <android.support.design.widget.TextInputEditText
+                            <androidx.appcompat.widget.AppCompatEditText
                                 android:id="@+id/main_file_name"
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
-                                android:text="@string/default_main_file_name"
-                                android:hint="@string/text_main_file_name"/>
+                                android:text="@string/default_main_file_name"/>
 
-                        </android.support.design.widget.TextInputLayout>
+                        </com.google.android.material.textfield.TextInputLayout>
 
                         <org.autojs.autojs.ui.widget.CheckBoxCompat
-                            android:layout_width="wrap_content"
                             android:id="@+id/default_stable_mode"
-                            android:text="@string/text_stable_mode"
-                            android:layout_height="wrap_content"/>
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/text_stable_mode"/>
 
                     </LinearLayout>
 
-                </android.support.v7.widget.CardView>
+                </androidx.cardview.widget.CardView>
             </LinearLayout>
         </ScrollView>
 
diff --git a/app/src/main/res/layout/activity_register.xml b/app/src/main/res/layout/activity_register.xml
index 95c41ea3..59336b34 100644
--- a/app/src/main/res/layout/activity_register.xml
+++ b/app/src/main/res/layout/activity_register.xml
@@ -10,7 +10,7 @@
         android:layout_height="wrap_content"
         android:orientation="vertical">
 
-        <android.support.design.widget.AppBarLayout
+        <com.google.android.material.appbar.AppBarLayout
             android:id="@+id/app_bar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -20,62 +20,63 @@
                 android:id="@+id/toolbar"
                 android:layout_width="match_parent"
                 android:layout_height="?attr/actionBarSize"
+                android:theme="@style/ToolBarStyle"
                 android:title="@string/text_login"
                 app:layout_scrollFlags="scroll|enterAlways"
                 app:popupTheme="@style/AppTheme.PopupOverlay"/>
 
-        </android.support.design.widget.AppBarLayout>
+        </com.google.android.material.appbar.AppBarLayout>
 
 
-        <android.support.design.widget.TextInputLayout
+        <com.google.android.material.textfield.TextInputLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="8dp"
             android:layout_marginLeft="8dp"
+            android:layout_marginTop="12dp"
             android:layout_marginRight="8dp"
-            android:layout_marginTop="12dp">
+            android:layout_marginBottom="8dp"
+            android:hint="@string/text_email">
 
-            <android.support.design.widget.TextInputEditText
+            <androidx.appcompat.widget.AppCompatEditText
                 android:id="@+id/email"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:hint="@string/text_email"
                 android:inputType="textEmailAddress"
-                android:textColor="#dd000000"/>
+                android:textColor="?android:textColorPrimary"/>
 
-        </android.support.design.widget.TextInputLayout>
+        </com.google.android.material.textfield.TextInputLayout>
 
-        <android.support.design.widget.TextInputLayout
+        <com.google.android.material.textfield.TextInputLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="8dp"
             android:layout_marginLeft="8dp"
-            android:layout_marginRight="8dp">
+            android:layout_marginRight="8dp"
+            android:layout_marginBottom="8dp"
+            android:hint="@string/text_username">
 
-            <android.support.design.widget.TextInputEditText
+            <androidx.appcompat.widget.AppCompatEditText
                 android:id="@+id/username"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:hint="@string/text_username"
-                android:textColor="#dd000000"/>
+                android:textColor="?android:textColorPrimary"/>
 
-        </android.support.design.widget.TextInputLayout>
+        </com.google.android.material.textfield.TextInputLayout>
 
-        <android.support.design.widget.TextInputLayout
+        <com.google.android.material.textfield.TextInputLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginLeft="8dp"
-            android:layout_marginRight="8dp">
+            android:layout_marginRight="8dp"
+            android:hint="@string/text_password">
 
-            <android.support.design.widget.TextInputEditText
+            <androidx.appcompat.widget.AppCompatEditText
                 android:id="@+id/password"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:hint="@string/text_password"
                 android:inputType="textPassword"
-                android:textColor="#dd000000"/>
+                android:textColor="?android:textColorPrimary"/>
 
-        </android.support.design.widget.TextInputLayout>
+        </com.google.android.material.textfield.TextInputLayout>
 
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/activity_script_widget_settings.xml b/app/src/main/res/layout/activity_script_widget_settings.xml
index 5aa64c04..a460bbb1 100644
--- a/app/src/main/res/layout/activity_script_widget_settings.xml
+++ b/app/src/main/res/layout/activity_script_widget_settings.xml
@@ -5,7 +5,7 @@
               android:layout_height="match_parent"
               android:orientation="vertical">
 
-    <android.support.design.widget.AppBarLayout
+    <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@android:color/transparent"
@@ -15,14 +15,15 @@
 
         <com.stardust.theme.widget.ThemeColorToolbar
             android:id="@+id/toolbar"
+            android:theme="@style/ToolBarStyle"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
             app:popupTheme="@style/AppTheme.PopupOverlay"
-            app:title="@string/_app_name">
+            app:title="@string/app_name">
 
 
         </com.stardust.theme.widget.ThemeColorToolbar>
-    </android.support.design.widget.AppBarLayout>
+    </com.google.android.material.appbar.AppBarLayout>
 
     <org.autojs.autojs.ui.explorer.ExplorerView
         android:id="@+id/script_list"
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index 90da73e4..a6a04a84 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -3,24 +3,24 @@
               xmlns:app="http://schemas.android.com/apk/res-auto"
               android:layout_width="match_parent"
               android:layout_height="match_parent"
-              android:background="@android:color/white"
               android:fitsSystemWindows="true"
               android:orientation="vertical">
 
 
-    <android.support.design.widget.AppBarLayout
+    <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:theme="@style/AppTheme.AppBarOverlay">
 
         <com.stardust.theme.widget.ThemeColorToolbar
             android:id="@+id/toolbar"
+            android:theme="@style/ToolBarStyle"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
             android:background="?attr/colorPrimary"
             app:popupTheme="@style/AppTheme.PopupOverlay"/>
 
-    </android.support.design.widget.AppBarLayout>
+    </com.google.android.material.appbar.AppBarLayout>
 
     <FrameLayout
         android:id="@+id/fragment_setting"
diff --git a/app/src/main/res/layout/activity_shortcut_icon_select.xml b/app/src/main/res/layout/activity_shortcut_icon_select.xml
index a46c63fc..e075172f 100644
--- a/app/src/main/res/layout/activity_shortcut_icon_select.xml
+++ b/app/src/main/res/layout/activity_shortcut_icon_select.xml
@@ -6,7 +6,7 @@
               android:orientation="vertical">
 
 
-    <android.support.design.widget.AppBarLayout
+    <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/app_bar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -15,17 +15,17 @@
         <com.stardust.theme.widget.ThemeColorToolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
+            android:theme="@style/ToolBarStyle"
             android:layout_height="?attr/actionBarSize"
-            android:title="@string/_app_name"
+            android:title="@string/app_name"
             app:layout_scrollFlags="scroll|enterAlways"
             app:popupTheme="@style/AppTheme.PopupOverlay"/>
 
-    </android.support.design.widget.AppBarLayout>
+    </com.google.android.material.appbar.AppBarLayout>
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/apps"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@android:color/white"/>
+        android:layout_height="match_parent"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml
index b1674ead..43c7a5a1 100644
--- a/app/src/main/res/layout/activity_splash.xml
+++ b/app/src/main/res/layout/activity_splash.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              xmlns:tools="http://schemas.android.com/tools"
               android:layout_width="match_parent"
               android:layout_height="match_parent"
               android:background="@android:color/white"
@@ -13,11 +12,6 @@
         android:layout_height="0dp"
         android:layout_weight="1">
 
-        <com.xcy8.ads.view.FullScreenAdView
-            android:id="@+id/full_screen_view"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"/>
-
     </RelativeLayout>
 
     <LinearLayout
diff --git a/app/src/main/res/layout/activity_tasker_edit.xml b/app/src/main/res/layout/activity_tasker_edit.xml
index cd6af677..184d5a3b 100644
--- a/app/src/main/res/layout/activity_tasker_edit.xml
+++ b/app/src/main/res/layout/activity_tasker_edit.xml
@@ -5,7 +5,7 @@
               android:layout_height="match_parent"
               android:orientation="vertical">
 
-    <android.support.design.widget.AppBarLayout
+    <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@android:color/transparent"
@@ -15,14 +15,15 @@
 
         <com.stardust.theme.widget.ThemeColorToolbar
             android:id="@+id/toolbar"
+            android:theme="@style/ToolBarStyle"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
             app:popupTheme="@style/AppTheme.PopupOverlay"
-            app:title="@string/_app_name">
+            app:title="@string/app_name">
 
 
         </com.stardust.theme.widget.ThemeColorToolbar>
-    </android.support.design.widget.AppBarLayout>
+    </com.google.android.material.appbar.AppBarLayout>
 
     <LinearLayout
         android:id="@+id/edit_script"
diff --git a/app/src/main/res/layout/activity_timed_task_setting.xml b/app/src/main/res/layout/activity_timed_task_setting.xml
index fc19525c..9708aa8a 100644
--- a/app/src/main/res/layout/activity_timed_task_setting.xml
+++ b/app/src/main/res/layout/activity_timed_task_setting.xml
@@ -6,7 +6,7 @@
               android:orientation="vertical">
 
 
-    <android.support.design.widget.AppBarLayout
+    <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:theme="@style/AppTheme.AppBarOverlay">
@@ -16,9 +16,10 @@
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
             android:background="?attr/colorPrimary"
+            android:theme="@style/ToolBarStyle"
             app:popupTheme="@style/AppTheme.PopupOverlay"/>
 
-    </android.support.design.widget.AppBarLayout>
+    </com.google.android.material.appbar.AppBarLayout>
 
     <ScrollView
         android:layout_width="match_parent"
@@ -30,13 +31,12 @@
             android:orientation="vertical">
 
 
-            <android.support.v7.widget.CardView
+            <androidx.cardview.widget.CardView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="6dp"
-                android:layout_marginRight="6dp"
                 android:layout_marginTop="12dp"
-                app:cardBackgroundColor="@android:color/white"
+                android:layout_marginRight="6dp"
                 app:cardCornerRadius="2dp"
                 app:cardElevation="1dp"
                 app:cardUseCompatPadding="true">
@@ -108,8 +108,8 @@
                                 android:background="?selectableItemBackground"
                                 android:gravity="center_vertical"
                                 android:orientation="horizontal"
-                                android:paddingBottom="6dp"
-                                android:paddingTop="6dp">
+                                android:paddingTop="6dp"
+                                android:paddingBottom="6dp">
 
                                 <org.autojs.autojs.theme.widget.ThemeColorImageViewCompat
                                     android:layout_width="24dp"
@@ -124,7 +124,7 @@
                                     android:layout_height="36dp"
                                     android:layout_marginLeft="12dp"
                                     android:gravity="center_vertical"
-                                    android:textColor="#202020"
+                                    android:textColor="?android:textColorPrimary"
                                     android:textSize="16sp"/>
                             </LinearLayout>
 
@@ -132,8 +132,8 @@
                                 android:id="@+id/disposable_task_date_container"
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
-                                android:layout_alignParentBottom="true"
                                 android:layout_below="@+id/disposable_task_time_container"
+                                android:layout_alignParentBottom="true"
                                 android:background="?selectableItemBackground"
                                 android:gravity="center_vertical"
                                 android:orientation="horizontal"
@@ -153,7 +153,7 @@
                                     android:layout_height="36dp"
                                     android:layout_marginLeft="12dp"
                                     android:gravity="center_vertical"
-                                    android:textColor="#202020"
+                                    android:textColor="?android:textColorPrimary"
                                     android:textSize="16sp"/>
                             </LinearLayout>
 
@@ -279,6 +279,14 @@
                                     android:layout_height="wrap_content"
                                     android:orientation="vertical">
 
+                                    <RadioButton
+                                        android:id="@+id/run_on_startup"
+                                        android:layout_width="match_parent"
+                                        android:layout_height="wrap_content"
+                                        android:layout_marginTop="16dp"
+                                        android:paddingLeft="8dp"
+                                        android:text="@string/text_run_on_startup"/>
+
                                     <RadioButton
                                         android:id="@+id/run_on_boot"
                                         android:layout_width="match_parent"
@@ -401,31 +409,30 @@
 
                                 </RadioGroup>
 
-                                <android.support.design.widget.TextInputLayout
+                                <com.google.android.material.textfield.TextInputLayout
                                     android:layout_width="match_parent"
                                     android:layout_height="wrap_content"
                                     android:layout_marginLeft="36dp"
-                                    android:layout_marginTop="2dp">
+                                    android:layout_marginTop="2dp"
+                                    android:hint="@string/text_broadcast_action">
 
 
-                                    <android.support.design.widget.TextInputEditText
+                                    <androidx.appcompat.widget.AppCompatEditText
                                         android:id="@+id/action"
                                         android:layout_width="match_parent"
                                         android:layout_height="wrap_content"
-                                        android:hint="@string/text_broadcast_action"
                                         android:maxLines="2"
                                         android:text="@string/text_broadcast_action_prefix"/>
 
-                                </android.support.design.widget.TextInputLayout>
+                                </com.google.android.material.textfield.TextInputLayout>
 
                             </LinearLayout>
 
-
                         </com.github.aakira.expandablelayout.ExpandableRelativeLayout>
                     </RadioGroup>
                 </LinearLayout>
 
-            </android.support.v7.widget.CardView>
+            </androidx.cardview.widget.CardView>
         </LinearLayout>
     </ScrollView>
 
diff --git a/app/src/main/res/layout/activity_view_sample.xml b/app/src/main/res/layout/activity_view_sample.xml
index d973ed6a..20c0ed90 100644
--- a/app/src/main/res/layout/activity_view_sample.xml
+++ b/app/src/main/res/layout/activity_view_sample.xml
@@ -8,7 +8,7 @@
     android:orientation="vertical"
     tools:context="org.autojs.autojs.ui.edit.EditActivity">
 
-    <android.support.design.widget.AppBarLayout
+    <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:theme="@style/AppTheme.AppBarOverlay">
@@ -16,9 +16,10 @@
         <com.stardust.theme.widget.ThemeColorToolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
+            android:theme="@style/ToolBarStyle"
             android:layout_height="?attr/actionBarSize"
             android:background="?attr/colorPrimary"
-            android:title="@string/_app_name"
+            android:title="@string/app_name"
             app:popupTheme="@style/AppTheme.PopupOverlay">
 
             <LinearLayout
@@ -49,7 +50,7 @@
 
         </com.stardust.theme.widget.ThemeColorToolbar>
 
-    </android.support.design.widget.AppBarLayout>
+    </com.google.android.material.appbar.AppBarLayout>
 
     <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
                    xmlns:tools="http://schemas.android.com/tools"
diff --git a/app/src/main/res/layout/activity_web.xml b/app/src/main/res/layout/activity_web.xml
index 1179b1c0..fddc72f8 100644
--- a/app/src/main/res/layout/activity_web.xml
+++ b/app/src/main/res/layout/activity_web.xml
@@ -6,7 +6,7 @@
               android:orientation="vertical">
 
 
-    <android.support.design.widget.AppBarLayout
+    <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/app_bar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -14,13 +14,14 @@
 
         <com.stardust.theme.widget.ThemeColorToolbar
             android:id="@+id/toolbar"
+            android:theme="@style/ToolBarStyle"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
             android:title="@string/text_login"
             app:layout_scrollFlags="scroll|enterAlways"
             app:popupTheme="@style/AppTheme.PopupOverlay"/>
 
-    </android.support.design.widget.AppBarLayout>
+    </com.google.android.material.appbar.AppBarLayout>
 
     <org.autojs.autojs.ui.main.community.CommunityWebView
         android:id="@+id/eweb_view"
diff --git a/app/src/main/res/layout/air_activity_issue_reporter.xml b/app/src/main/res/layout/air_activity_issue_reporter.xml
index 8be45975..b86892c5 100644
--- a/app/src/main/res/layout/air_activity_issue_reporter.xml
+++ b/app/src/main/res/layout/air_activity_issue_reporter.xml
@@ -28,17 +28,17 @@
               android:layout_height="match_parent"
               android:orientation="vertical">
 
-    <android.support.design.widget.AppBarLayout
+    <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:theme="@style/AppTheme.AppBarOverlay">
 
-        <android.support.v7.widget.Toolbar
+        <androidx.appcompat.widget.Toolbar
             android:id="@+id/air_toolbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"/>
 
-    </android.support.design.widget.AppBarLayout>
+    </com.google.android.material.appbar.AppBarLayout>
 
     <FrameLayout
         android:layout_width="match_parent"
@@ -62,12 +62,12 @@
                     android:layout_height="wrap_content"/>
 
                 <include
-                    layout="@layout/air_card_login"
+                    layout="@layout/air_card_login_compat"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="@dimen/air_card_margin_top"/>
 
-                <android.support.v4.widget.Space
+                <android.widget.Space
                     android:layout_width="match_parent"
                     android:layout_height="56dp"
                     android:layout_margin="@dimen/air_baseline"/>
@@ -76,7 +76,7 @@
 
         </ScrollView>
 
-        <android.support.design.widget.FloatingActionButton
+        <com.google.android.material.floatingactionbutton.FloatingActionButton
             android:id="@+id/air_buttonSend"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/air_card_login_compat.xml b/app/src/main/res/layout/air_card_login_compat.xml
new file mode 100644
index 00000000..ea52b5b5
--- /dev/null
+++ b/app/src/main/res/layout/air_card_login_compat.xml
@@ -0,0 +1,156 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ MIT License
+  ~
+  ~ Copyright (c) 2017 Jan Heinrich Reimer
+  ~
+  ~ Permission is hereby granted, free of charge, to any person obtaining a copy
+  ~ of this software and associated documentation files (the "Software"), to deal
+  ~ in the Software without restriction, including without limitation the rights
+  ~ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  ~ copies of the Software, and to permit persons to whom the Software is
+  ~ furnished to do so, subject to the following conditions:
+  ~
+  ~ The above copyright notice and this permission notice shall be included in all
+  ~ copies or substantial portions of the Software.
+  ~
+  ~ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  ~ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  ~ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  ~ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  ~ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  ~ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  ~ SOFTWARE.
+  -->
+
+<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+                                    xmlns:app="http://schemas.android.com/apk/res-auto"
+                                    android:layout_width="match_parent"
+                                    android:layout_height="match_parent"
+                                    app:cardBackgroundColor="?cardBackgroundColor">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        android:padding="@dimen/air_baseline">
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/air_title_login"
+            android:textAppearance="@style/TextAppearance.AppCompat.Body2"
+            android:textColor="?android:textColorSecondary"/>
+
+        <RadioGroup xmlns:android="http://schemas.android.com/apk/res/android"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical">
+
+            <RadioButton
+                android:id="@+id/air_optionUseAccount"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/air_baseline"
+                android:checked="true"
+                android:paddingStart="@dimen/air_radio_button_padding_start"
+                android:paddingLeft="@dimen/air_radio_button_padding_start"
+                android:paddingEnd="0dp"
+                android:paddingRight="0dp"
+                android:text="@string/air_label_use_account"/>
+
+            <com.github.aakira.expandablelayout.ExpandableRelativeLayout
+                android:id="@+id/air_layoutLogin"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:ael_expanded="true"
+                app:ael_interpolator="fastOutSlowIn"
+                app:ael_orientation="vertical">
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical">
+
+                    <com.google.android.material.textfield.TextInputLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/air_baseline_half"
+                        android:hint="@string/air_label_username">
+
+                        <androidx.appcompat.widget.AppCompatEditText
+                            android:id="@+id/air_inputUsername"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:inputType="textNoSuggestions"
+                            android:maxLines="1"/>
+
+                    </com.google.android.material.textfield.TextInputLayout>
+
+                    <com.google.android.material.textfield.TextInputLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/air_baseline_half"
+                        android:hint="@string/air_label_password"
+                        app:passwordToggleEnabled="true">
+
+                        <androidx.appcompat.widget.AppCompatEditText
+                            android:id="@+id/air_inputPassword"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:imeOptions="actionSend"
+                            android:inputType="textPassword"/>
+
+                    </com.google.android.material.textfield.TextInputLayout>
+
+                </LinearLayout>
+
+            </com.github.aakira.expandablelayout.ExpandableRelativeLayout>
+
+            <RadioButton
+                android:id="@+id/air_optionAnonymous"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/air_baseline"
+                android:paddingStart="@dimen/air_radio_button_padding_start"
+                android:paddingLeft="@dimen/air_radio_button_padding_start"
+                android:paddingEnd="0dp"
+                android:paddingRight="0dp"
+                android:text="@string/air_label_use_guest"/>
+
+            <com.github.aakira.expandablelayout.ExpandableRelativeLayout
+                android:id="@+id/air_layoutGuest"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:ael_expanded="false"
+                app:ael_interpolator="fastOutSlowIn"
+                app:ael_orientation="vertical">
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical">
+
+                    <com.google.android.material.textfield.TextInputLayout
+                        android:id="@+id/air_inputEmailParent"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/air_baseline_half"
+                        android:hint="@string/air_label_email_optional">
+
+                        <androidx.appcompat.widget.AppCompatEditText
+                            android:id="@+id/air_inputEmail"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:inputType="textEmailAddress"
+                            android:maxLines="1"/>
+
+                    </com.google.android.material.textfield.TextInputLayout>
+
+                </LinearLayout>
+
+            </com.github.aakira.expandablelayout.ExpandableRelativeLayout>
+        </RadioGroup>
+
+    </LinearLayout>
+
+</androidx.cardview.widget.CardView>
diff --git a/app/src/main/res/layout/air_card_report_compat.xml b/app/src/main/res/layout/air_card_report_compat.xml
index f7873aa3..6a555d1b 100644
--- a/app/src/main/res/layout/air_card_report_compat.xml
+++ b/app/src/main/res/layout/air_card_report_compat.xml
@@ -22,7 +22,7 @@
   ~ SOFTWARE.
   -->
 
-<android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
                                     xmlns:app="http://schemas.android.com/apk/res-auto"
                                     android:layout_width="match_parent"
                                     android:layout_height="match_parent"
@@ -41,36 +41,36 @@
             android:textAppearance="@style/TextAppearance.AppCompat.Body2"
             android:textColor="?android:textColorSecondary"/>
 
-        <android.support.design.widget.TextInputLayout
+        <com.google.android.material.textfield.TextInputLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/air_baseline">
+            android:layout_marginTop="@dimen/air_baseline"
+            android:hint="@string/air_label_issue_title">
 
-            <android.support.design.widget.TextInputEditText
+            <androidx.appcompat.widget.AppCompatEditText
                 android:id="@+id/air_inputTitle"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:hint="@string/air_label_issue_title"
                 android:inputType="textCapSentences"
                 android:maxLines="1"/>
 
-        </android.support.design.widget.TextInputLayout>
+        </com.google.android.material.textfield.TextInputLayout>
 
-        <android.support.design.widget.TextInputLayout
+        <com.google.android.material.textfield.TextInputLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/air_baseline_half">
+            android:layout_marginTop="@dimen/air_baseline_half"
+            android:hint="@string/air_label_issue_description">
 
-            <android.support.design.widget.TextInputEditText
+            <androidx.appcompat.widget.AppCompatEditText
                 android:id="@+id/air_inputDescription"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:hint="@string/air_label_issue_description"
                 android:inputType="textMultiLine|textCapSentences"
                 android:lines="2"
                 android:scrollbars="vertical"/>
 
-        </android.support.design.widget.TextInputLayout>
+        </com.google.android.material.textfield.TextInputLayout>
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -85,7 +85,7 @@
                 android:text="@string/air_label_device_info"
                 android:textAppearance="@style/TextAppearance.AppCompat.Subhead"/>
 
-            <android.support.v7.widget.AppCompatImageButton
+            <androidx.appcompat.widget.AppCompatImageButton
                 android:id="@+id/air_buttonDeviceInfo"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -105,7 +105,7 @@
             app:ael_interpolator="fastOutSlowIn"
             app:ael_orientation="vertical">
 
-            <android.support.v7.widget.AppCompatTextView
+            <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/air_textDeviceInfo"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -117,4 +117,4 @@
 
     </LinearLayout>
 
-</android.support.v7.widget.CardView>
\ No newline at end of file
+</androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/bubble_popup_menu.xml b/app/src/main/res/layout/bubble_popup_menu.xml
index 55d605ca..d104cdd4 100644
--- a/app/src/main/res/layout/bubble_popup_menu.xml
+++ b/app/src/main/res/layout/bubble_popup_menu.xml
@@ -13,11 +13,11 @@
         android:layout_gravity="center_horizontal"
         android:background="@drawable/little_triangle"/>
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/list"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:background="@drawable/bubble"
-        app:layoutManager="android.support.v7.widget.LinearLayoutManager"/>
+        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/debug_bar.xml b/app/src/main/res/layout/debug_bar.xml
index 66b9f8f1..26fa2ab9 100644
--- a/app/src/main/res/layout/debug_bar.xml
+++ b/app/src/main/res/layout/debug_bar.xml
@@ -46,7 +46,7 @@
             android:tint="@android:color/white"/>
     </LinearLayout>
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/variables"
         android:layout_width="match_parent"
         android:layout_height="match_parent"/>
diff --git a/app/src/main/res/layout/dialog_class_search.xml b/app/src/main/res/layout/dialog_class_search.xml
index 88874bc3..ab9a1b9d 100644
--- a/app/src/main/res/layout/dialog_class_search.xml
+++ b/app/src/main/res/layout/dialog_class_search.xml
@@ -4,22 +4,22 @@
               android:layout_height="match_parent"
               android:orientation="vertical">
 
-    <android.support.design.widget.TextInputLayout
+    <com.google.android.material.textfield.TextInputLayout
         android:layout_width="match_parent"
         android:hint="@string/text_class_or_package_name"
         android:layout_height="wrap_content">
 
-        <android.support.design.widget.TextInputEditText
+        <androidx.appcompat.widget.AppCompatEditText
             android:id="@+id/keywords"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"/>
-    </android.support.design.widget.TextInputLayout>
+    </com.google.android.material.textfield.TextInputLayout>
 
     <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <android.support.v7.widget.RecyclerView
+        <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/result_list"
             android:layout_width="match_parent"
             android:layout_height="400dp"/>
diff --git a/app/src/main/res/layout/dialog_code_generate.xml b/app/src/main/res/layout/dialog_code_generate.xml
index 0e77b3ae..ed932412 100644
--- a/app/src/main/res/layout/dialog_code_generate.xml
+++ b/app/src/main/res/layout/dialog_code_generate.xml
@@ -4,7 +4,7 @@
               android:layout_height="match_parent"
               android:orientation="vertical">
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/options"
         android:layout_width="match_parent"
         android:layout_height="match_parent"/>
diff --git a/app/src/main/res/layout/dialog_find_or_replace.xml b/app/src/main/res/layout/dialog_find_or_replace.xml
index 2cc2841b..5b45215b 100644
--- a/app/src/main/res/layout/dialog_find_or_replace.xml
+++ b/app/src/main/res/layout/dialog_find_or_replace.xml
@@ -8,16 +8,16 @@
               android:paddingRight="16dp"
               android:paddingTop="16dp">
 
-    <android.support.design.widget.TextInputLayout
+    <com.google.android.material.textfield.TextInputLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:hint="@string/text_find">
 
-        <android.support.v7.widget.AppCompatEditText
+        <androidx.appcompat.widget.AppCompatEditText
             android:id="@+id/keywords"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"/>
-    </android.support.design.widget.TextInputLayout>
+    </com.google.android.material.textfield.TextInputLayout>
 
     <CheckBox
         android:id="@+id/checkbox_regex"
@@ -25,16 +25,16 @@
         android:layout_height="wrap_content"
         android:text="@string/text_regex"/>
 
-    <android.support.design.widget.TextInputLayout
+    <com.google.android.material.textfield.TextInputLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:hint="@string/text_replace">
 
-        <android.support.v7.widget.AppCompatEditText
+        <androidx.appcompat.widget.AppCompatEditText
             android:id="@+id/replacement"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"/>
-    </android.support.design.widget.TextInputLayout>
+    </com.google.android.material.textfield.TextInputLayout>
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/dialog_script_loop.xml b/app/src/main/res/layout/dialog_script_loop.xml
index adbae78e..8a979a7e 100644
--- a/app/src/main/res/layout/dialog_script_loop.xml
+++ b/app/src/main/res/layout/dialog_script_loop.xml
@@ -8,65 +8,65 @@
               android:paddingRight="16dp">
 
 
-    <android.support.design.widget.TextInputLayout
+    <com.google.android.material.textfield.TextInputLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:hint="@string/text_loop_times">
 
-        <android.support.design.widget.TextInputEditText
+        <androidx.appcompat.widget.AppCompatEditText
             android:id="@+id/loop_times"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:hint="@string/text_loop_times"
             android:inputType="number"
             android:text="0"
             tools:ignore="HardcodedText"/>
 
-    </android.support.design.widget.TextInputLayout>
+    </com.google.android.material.textfield.TextInputLayout>
 
     <TextView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="8dp"
         android:layout_marginLeft="4dp"
+        android:layout_marginBottom="8dp"
         android:text="@string/hint_loop_times"
         android:textColor="#77000000"
         android:textSize="12sp"/>
 
-    <android.support.design.widget.TextInputLayout
+    <com.google.android.material.textfield.TextInputLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:hint="@string/text_loop_interval">
 
-        <android.support.design.widget.TextInputEditText
+        <androidx.appcompat.widget.AppCompatEditText
             android:id="@+id/loop_interval"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:hint="@string/text_loop_interval"
             android:inputType="numberDecimal"
             android:text="1.0"
             tools:ignore="HardcodedText"/>
 
-    </android.support.design.widget.TextInputLayout>
+    </com.google.android.material.textfield.TextInputLayout>
 
-    <android.support.design.widget.TextInputLayout
+    <com.google.android.material.textfield.TextInputLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:hint="@string/text_loop_delay">
 
-        <android.support.design.widget.TextInputEditText
+        <androidx.appcompat.widget.AppCompatEditText
             android:id="@+id/loop_delay"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:hint="@string/text_loop_delay"
             android:inputType="numberDecimal"
             android:text="0.0"
             tools:ignore="HardcodedText"/>
 
-    </android.support.design.widget.TextInputLayout>
+    </com.google.android.material.textfield.TextInputLayout>
 
     <TextView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="8dp"
         android:layout_marginLeft="4dp"
+        android:layout_marginBottom="8dp"
         android:text="@string/hint_loop_delay"
         android:textColor="#77000000"
         android:textSize="12sp"/>
diff --git a/app/src/main/res/layout/dialog_text_size_setting.xml b/app/src/main/res/layout/dialog_text_size_setting.xml
index cc800d8f..89554e7c 100644
--- a/app/src/main/res/layout/dialog_text_size_setting.xml
+++ b/app/src/main/res/layout/dialog_text_size_setting.xml
@@ -8,7 +8,7 @@
               android:paddingRight="16dp"
               android:paddingTop="8dp">
 
-    <android.support.v7.widget.AppCompatSeekBar
+    <androidx.appcompat.widget.AppCompatSeekBar
         android:id="@+id/seekbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -51,7 +51,7 @@
         android:layout_marginTop="8dp"
         android:gravity="center"
         android:minHeight="60dp"
-        android:text="@string/_app_name"
+        android:text="@string/app_name"
         android:textColor="@android:color/primary_text_light"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/drawer_menu_group.xml b/app/src/main/res/layout/drawer_menu_group.xml
index 425d1a61..d1b55a73 100644
--- a/app/src/main/res/layout/drawer_menu_group.xml
+++ b/app/src/main/res/layout/drawer_menu_group.xml
@@ -2,16 +2,16 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
              android:layout_width="match_parent"
              android:layout_height="wrap_content"
-             android:background="#f0f1f5"
+             android:background="?android:divider"
              android:paddingTop="@dimen/divider_drawer_menu_group">
 
     <TextView xmlns:android="http://schemas.android.com/apk/res/android"
               android:id="@+id/title"
               android:layout_width="match_parent"
               android:layout_height="wrap_content"
-              android:background="#ffffff"
+              android:background="?android:windowBackground"
               android:padding="8dp"
-              android:textColor="#999999"
+              android:textColor="?drawer_group_text_color"
               android:textSize="12sp">
 
     </TextView>
diff --git a/app/src/main/res/layout/drawer_menu_item.xml b/app/src/main/res/layout/drawer_menu_item.xml
index d9e610be..4b8acd65 100644
--- a/app/src/main/res/layout/drawer_menu_item.xml
+++ b/app/src/main/res/layout/drawer_menu_item.xml
@@ -38,7 +38,7 @@
         android:layout_centerVertical="true"
         android:layout_toRightOf="@+id/icon_container"
         android:gravity="center_vertical"
-        android:textColor="#484C4F"
+        android:textColor="?drawer_item_text_color"
         android:textSize="14sp"
         tools:text="@string/text_auto_operate_service"/>
 
diff --git a/app/src/main/res/layout/editor_view.xml b/app/src/main/res/layout/editor_view.xml
index 09081cb3..3c031250 100644
--- a/app/src/main/res/layout/editor_view.xml
+++ b/app/src/main/res/layout/editor_view.xml
@@ -5,7 +5,7 @@
               android:layout_height="match_parent"
               android:orientation="vertical">
 
-    <android.support.design.widget.AppBarLayout
+    <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:theme="@style/AppTheme.AppBarOverlay">
@@ -15,8 +15,9 @@
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
+            android:theme="@style/ToolBarStyle"
             android:background="?attr/colorPrimary"
-            android:title="@string/_app_name"
+            android:title="@string/app_name"
             app:popupTheme="@style/AppTheme.PopupOverlay">
 
             <FrameLayout
@@ -28,10 +29,10 @@
         </com.stardust.theme.widget.ThemeColorToolbar>
 
 
-    </android.support.design.widget.AppBarLayout>
+    </com.google.android.material.appbar.AppBarLayout>
 
 
-    <android.support.v4.widget.DrawerLayout
+    <androidx.drawerlayout.widget.DrawerLayout
         android:id="@+id/drawer_layout"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
@@ -102,6 +103,6 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_gravity="start"/>
-    </android.support.v4.widget.DrawerLayout>
+    </androidx.drawerlayout.widget.DrawerLayout>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/explorer_project_toolbar.xml b/app/src/main/res/layout/explorer_project_toolbar.xml
index d479e1af..7afcbbf5 100644
--- a/app/src/main/res/layout/explorer_project_toolbar.xml
+++ b/app/src/main/res/layout/explorer_project_toolbar.xml
@@ -43,7 +43,7 @@
         android:layout_marginRight="2dp"
         android:background="?selectableItemBackgroundBorderless"
         android:padding="6dp"
-        android:src="@drawable/ic_build_black_48dp"
+        android:src="@drawable/ic_build_apk"
         android:tint="#606366"/>
 
     <ImageView
diff --git a/app/src/main/res/layout/explorer_view.xml b/app/src/main/res/layout/explorer_view.xml
index d0164e3c..6ddd6496 100644
--- a/app/src/main/res/layout/explorer_view.xml
+++ b/app/src/main/res/layout/explorer_view.xml
@@ -18,7 +18,7 @@
         app:cardUseCompatPadding="true"
         android:layout_height="wrap_content"/>
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/explorer_item_list"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"/>
diff --git a/app/src/main/res/layout/file_choose_list_directory.xml b/app/src/main/res/layout/file_choose_list_directory.xml
index 0d3a9855..084abeb3 100644
--- a/app/src/main/res/layout/file_choose_list_directory.xml
+++ b/app/src/main/res/layout/file_choose_list_directory.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
                                     xmlns:app="http://schemas.android.com/apk/res-auto"
                                     xmlns:tools="http://schemas.android.com/tools"
                                     android:id="@+id/item"
@@ -53,4 +53,4 @@
 
 
     </LinearLayout>
-</android.support.v7.widget.CardView>
\ No newline at end of file
+</androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/floating_manual_dialog.xml b/app/src/main/res/layout/floating_manual_dialog.xml
index bd2fd1aa..3c05a15e 100644
--- a/app/src/main/res/layout/floating_manual_dialog.xml
+++ b/app/src/main/res/layout/floating_manual_dialog.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
                                     xmlns:app="http://schemas.android.com/apk/res-auto"
                                     xmlns:tools="http://schemas.android.com/tools"
                                     android:layout_width="match_parent"
@@ -69,4 +69,4 @@
             android:layout_height="match_parent"/>
     </LinearLayout>
 
-</android.support.v7.widget.CardView>
\ No newline at end of file
+</androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_drawer.xml b/app/src/main/res/layout/fragment_drawer.xml
index db66ed93..98d0f186 100644
--- a/app/src/main/res/layout/fragment_drawer.xml
+++ b/app/src/main/res/layout/fragment_drawer.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
               xmlns:app="http://schemas.android.com/apk/res-auto"
-              xmlns:tools="http://schemas.android.com/tools"
               android:layout_width="304dp"
               android:layout_height="match_parent"
-              android:background="@android:color/white"
+              android:background="?android:windowBackground"
               android:clickable="true"
               android:fitsSystemWindows="false"
               android:importantForAccessibility="no"
@@ -63,7 +62,7 @@
         android:layout_height="match_parent"
         android:orientation="vertical">
 
-        <android.support.v7.widget.RecyclerView
+        <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/drawer_menu"
             android:layout_width="match_parent"
             android:layout_height="0dp"
@@ -73,7 +72,7 @@
         <View
             android:layout_width="match_parent"
             android:layout_height="1dp"
-            android:background="#f2f3f5"/>
+            android:background="?android:divider"/>
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -104,6 +103,7 @@
                     android:layout_gravity="center_vertical"
                     android:gravity="center"
                     android:text="@string/text_setting"
+                    android:textColor="?android:textColorPrimary"
                     android:textSize="15sp"/>
             </LinearLayout>
 
@@ -128,6 +128,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_vertical"
+                    android:textColor="?android:textColorPrimary"
                     android:gravity="center"
                     android:text="@string/text_exit"
                     android:textSize="15sp"/>
diff --git a/app/src/main/res/layout/fragment_my_script_list.xml b/app/src/main/res/layout/fragment_my_script_list.xml
index c965dadd..15d80395 100644
--- a/app/src/main/res/layout/fragment_my_script_list.xml
+++ b/app/src/main/res/layout/fragment_my_script_list.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-             xmlns:app="http://schemas.android.com/apk/res-auto"
              android:layout_width="match_parent"
              android:layout_height="match_parent">
 
diff --git a/app/src/main/res/layout/fragment_normal_toolbar.xml b/app/src/main/res/layout/fragment_normal_toolbar.xml
index a5ca5924..cedf1047 100644
--- a/app/src/main/res/layout/fragment_normal_toolbar.xml
+++ b/app/src/main/res/layout/fragment_normal_toolbar.xml
@@ -11,7 +11,7 @@
         android:layout_width="40dp"
         android:layout_height="match_parent"
         app:icon="@drawable/ic_play_arrow_white_48dp"
-        app:icon_color="@android:color/white"
+        app:icon_color="@color/toolbar"
         app:text="@string/text_run"/>
 
     <org.autojs.autojs.ui.widget.ToolbarMenuItem
@@ -19,6 +19,7 @@
         android:layout_width="40dp"
         android:layout_height="match_parent"
         app:icon="@drawable/ic_undo_white_48dp"
+        app:icon_color="@color/toolbar"
         app:text="@string/text_undo"/>
 
     <org.autojs.autojs.ui.widget.ToolbarMenuItem
@@ -26,6 +27,7 @@
         android:layout_width="40dp"
         android:layout_height="match_parent"
         app:icon="@drawable/ic_redo_white_48dp"
+        app:icon_color="@color/toolbar"
         app:text="@string/text_redo"/>
 
     <org.autojs.autojs.ui.widget.ToolbarMenuItem
@@ -34,6 +36,7 @@
         android:layout_height="match_parent"
         android:enabled="false"
         app:icon="@drawable/ic_save_white_48dp"
+        app:icon_color="@color/toolbar"
         app:text="@string/text_save"/>
 
 
diff --git a/app/src/main/res/layout/fragment_search_toolbar.xml b/app/src/main/res/layout/fragment_search_toolbar.xml
index 7c829637..460e7b93 100644
--- a/app/src/main/res/layout/fragment_search_toolbar.xml
+++ b/app/src/main/res/layout/fragment_search_toolbar.xml
@@ -11,6 +11,7 @@
         android:layout_width="40dp"
         android:layout_height="match_parent"
         app:icon="@drawable/ic_ali_replace"
+        app:icon_color="@color/toolbar"
         app:text="@string/text_replace"/>
 
     <org.autojs.autojs.ui.widget.ToolbarMenuItem
@@ -18,6 +19,7 @@
         android:layout_width="40dp"
         android:layout_height="match_parent"
         app:icon="@drawable/ic_ali_up"
+        app:icon_color="@color/toolbar"
         app:text="@string/text_find_prev"/>
 
     <org.autojs.autojs.ui.widget.ToolbarMenuItem
@@ -25,6 +27,7 @@
         android:layout_width="40dp"
         android:layout_height="match_parent"
         app:icon="@drawable/ic_ali_down"
+        app:icon_color="@color/toolbar"
         app:text="@string/text_find_next"/>
 
 
@@ -33,6 +36,7 @@
         android:layout_width="40dp"
         android:layout_height="match_parent"
         app:icon="@drawable/ic_close_white_48dp"
+        app:icon_color="@color/toolbar"
         app:text="@string/text_cancel"/>
 
 
diff --git a/app/src/main/res/layout/fragment_task_manager.xml b/app/src/main/res/layout/fragment_task_manager.xml
index 8c03fb7a..efd3f289 100644
--- a/app/src/main/res/layout/fragment_task_manager.xml
+++ b/app/src/main/res/layout/fragment_task_manager.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
              android:layout_width="match_parent"
-             android:layout_height="match_parent"
-             android:background="@android:color/white">
+             android:layout_height="match_parent">
 
 
     <org.autojs.autojs.theme.widget.ThemeColorSwipeRefreshLayout
diff --git a/app/src/main/res/layout/functions_keyboard_view.xml b/app/src/main/res/layout/functions_keyboard_view.xml
index 9a26c099..d2f8f182 100644
--- a/app/src/main/res/layout/functions_keyboard_view.xml
+++ b/app/src/main/res/layout/functions_keyboard_view.xml
@@ -9,7 +9,7 @@
         android:layout_height="1dp"
         android:background="@color/divider_functions_keyboard"/>
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/properties"
         android:layout_width="match_parent"
         android:layout_height="0dp"
@@ -21,7 +21,7 @@
         android:layout_height="1dp"
         android:background="@color/divider_functions_keyboard"/>
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/module_list"
         android:layout_width="match_parent"
         android:layout_height="50dp"/>
diff --git a/app/src/main/res/layout/option_list_view.xml b/app/src/main/res/layout/option_list_view.xml
index d4a9ee69..9db02643 100644
--- a/app/src/main/res/layout/option_list_view.xml
+++ b/app/src/main/res/layout/option_list_view.xml
@@ -19,7 +19,7 @@
         tools:text="标题"
         tools:visibility="visible"/>
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/list"
         android:layout_width="match_parent"
         android:layout_height="match_parent"/>
diff --git a/app/src/main/res/layout/script_file_list_directory.xml b/app/src/main/res/layout/script_file_list_directory.xml
index fa796a53..8640d038 100644
--- a/app/src/main/res/layout/script_file_list_directory.xml
+++ b/app/src/main/res/layout/script_file_list_directory.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
                                     xmlns:app="http://schemas.android.com/apk/res-auto"
                                     xmlns:tools="http://schemas.android.com/tools"
                                     android:id="@+id/item"
@@ -8,8 +8,9 @@
                                     android:layout_marginLeft="3dp"
                                     android:layout_marginRight="3dp"
                                     android:clickable="true"
+                                    android:focusable="true"
                                     android:foreground="?selectableItemBackground"
-                                    app:cardBackgroundColor="#ffffff"
+                                    app:cardBackgroundColor="?android:itemBackground"
                                     app:cardElevation="0.618dp"
                                     app:cardUseCompatPadding="true">
 
@@ -17,8 +18,8 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="horizontal"
-        android:paddingBottom="16dp"
-        android:paddingTop="16dp">
+        android:paddingTop="16dp"
+        android:paddingBottom="16dp">
 
         <ImageView
             android:id="@+id/icon"
@@ -37,7 +38,7 @@
             android:gravity="center_vertical"
             android:maxLines="1"
             android:paddingRight="16dp"
-            android:textColor="#484C4F"
+            android:textColor="?android:textColorPrimary"
             android:textSize="14sp"
             tools:text="正在运行的服务"/>
 
@@ -49,6 +50,7 @@
             android:layout_gravity="center_vertical"
             android:background="?selectableItemBackgroundBorderless"
             android:clickable="true"
+            android:focusable="true"
             android:paddingLeft="16dp"
             android:paddingRight="16dp"
             android:src="@drawable/ic_more_vert_black_24dp"
@@ -56,4 +58,4 @@
 
 
     </LinearLayout>
-</android.support.v7.widget.CardView>
\ No newline at end of file
+</androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/script_file_list_file.xml b/app/src/main/res/layout/script_file_list_file.xml
index 0e584f9e..1467c6c4 100644
--- a/app/src/main/res/layout/script_file_list_file.xml
+++ b/app/src/main/res/layout/script_file_list_file.xml
@@ -8,13 +8,13 @@
     <View
         android:layout_width="match_parent"
         android:layout_height="1px"
-        android:background="#EDEEEF"/>
+        android:background="?android:divider"/>
 
     <LinearLayout
         android:id="@+id/item"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@android:color/white"
+        android:background="@color/item_background_dark"
         android:clickable="true"
         android:foreground="?selectableItemBackground"
         android:orientation="horizontal"
@@ -47,7 +47,7 @@
                 android:ellipsize="end"
                 android:gravity="center_vertical"
                 android:maxLines="1"
-                android:textColor="#484C4F"
+                android:textColor="?android:textColorPrimary"
                 android:textSize="14sp"
                 tools:text="正在运行的服务"/>
 
@@ -60,7 +60,7 @@
                 android:ellipsize="end"
                 android:gravity="center_vertical"
                 android:maxLines="1"
-                android:textColor="#9DA0A2"
+                android:textColor="?android:textColorSecondary"
                 android:textSize="11sp"
                 tools:text="18 KB"/>
 
@@ -112,7 +112,7 @@
     <View
         android:layout_width="match_parent"
         android:layout_height="1px"
-        android:background="#EDEEEF"/>
+        android:background="?android:divider"/>
 
 </LinearLayout>
 
diff --git a/app/src/main/res/layout/shortcut_create_dialog.xml b/app/src/main/res/layout/shortcut_create_dialog.xml
index 5d4eddf6..4812446a 100644
--- a/app/src/main/res/layout/shortcut_create_dialog.xml
+++ b/app/src/main/res/layout/shortcut_create_dialog.xml
@@ -20,18 +20,18 @@
             android:padding="12dp"
             android:src="@drawable/ic_add_white_48dp"/>
 
-        <android.support.design.widget.TextInputLayout
+        <com.google.android.material.textfield.TextInputLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical">
+            android:layout_gravity="center_vertical"
+            android:hint="@string/text_name">
 
-            <android.support.design.widget.TextInputEditText
+            <androidx.appcompat.widget.AppCompatEditText
                 android:id="@+id/name"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:hint="@string/text_name"/>
+                android:layout_height="wrap_content"/>
 
-        </android.support.design.widget.TextInputLayout>
+        </com.google.android.material.textfield.TextInputLayout>
     </LinearLayout>
 
     <CheckBox
diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml
index 9a394757..8bd78db9 100644
--- a/app/src/main/res/menu/menu_main.xml
+++ b/app/src/main/res/menu/menu_main.xml
@@ -14,6 +14,6 @@
         android:imeOptions="actionSearch"
         android:inputType="text"
         android:title="@string/text_search"
-        app:actionViewClass="android.support.v7.widget.SearchView"
+        app:actionViewClass="androidx.appcompat.widget.SearchView"
         app:showAsAction="always|collapseActionView"/>
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml
index 8c677ed2..2741b21e 100644
--- a/app/src/main/res/values-en/strings.xml
+++ b/app/src/main/res/values-en/strings.xml
@@ -1,5 +1,5 @@
 <resources>
-    <string name="_app_name">Auto.js</string>
+    <string name="app_name">Auto.js</string>
     <string name="text_accessibility_service_description">Required by the script automatic operation (click, long press, slide, etc.).</string>
     <string name="text_new_file">New File</string>
     <string name="text_create_fail">Creation failed</string>
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
new file mode 100644
index 00000000..6181d8b3
--- /dev/null
+++ b/app/src/main/res/values-night/colors.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="window_background">#202020</color>
+    <color name="item_background">#333333</color>
+    <color name="item_background_dark">#252525</color>
+    <color name="text_color_primary">#7F7F80</color>
+    <color name="drawer_menu_item_text_color">#9a9a9a</color>
+    <color name="drawer_menu_group_text_color">#808080</color>
+    <color name="divider">#111214</color>
+    <color name="text_color_secondary">#9a9a9a</color>
+    <color name="text_color_thirdly">#808080</color>
+    <color name="tab_indicator">#6D6D6E</color>
+    <color name="tab_text">#3A3A3C</color>
+    <color name="toolbar">#8D8D8E</color>
+    <color name="toolbar_disabled">#3A3A3C</color>
+    <color name="console_debug">#dfc0c0c0</color>
+    <color name="console_verbose">#7F7F80</color>
+
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-night/styles.xml b/app/src/main/res/values-night/styles.xml
new file mode 100644
index 00000000..5d093628
--- /dev/null
+++ b/app/src/main/res/values-night/styles.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="ToolBarStyle" parent="ThemeOverlay.AppCompat.Dark.ActionBar">
+        <item name="android:textColorPrimary">@color/toolbar</item>
+        <item name="android:textColorSecondary">@color/toolbar</item>
+        <item name="actionMenuTextColor">@color/toolbar</item>
+    </style>
+    <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar">
+    </style>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index f557815c..4553903d 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -25,9 +25,5 @@
     <string name="air_dialog_description_failed_issues_not_available">Issues不可用，请联系软件开发者.</string>
     <string name="air_dialog_description_failed_unknown">未知错误</string>
     <string name="air_dialog_action_failed">OK</string>
-    <plurals name="air_error_short_description" key="air_error_short_description">
-        <item quantity="one">描述至少要 %d 个字.</item>
-        <item quantity="other">描述至少要 %d 个字.</item>
-    </plurals>
-    <string name="theme_color_red">R</string>
+
 </resources>
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 1e78fc7e..7b777c35 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -3,6 +3,9 @@
 
     <attr name="title" format="string|reference"/>
     <attr name="icon" format="reference"/>
+    <attr name="drawer_item_text_color" format="color|reference"/>
+    <attr name="drawer_group_text_color" format="color|reference"/>
+    <attr name="itemBackgroundDark" format="color|reference"/>
 
     <declare-styleable name="ToolbarMenuItem">
         <attr name="text" format="string|reference"/>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 78f27b1e..a9c7e701 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -12,4 +12,24 @@
     <color name="divider_functions_keyboard">#f0f0f0</color>
     <color name="color_red">#ef5350</color>
     <color name="project_toolbar_color">#777777</color>
+    <color name="theme_color_black">#111214</color>
+
+    <color name="window_background">#FFFFFF</color>
+    <color name="item_background">#FFFFFF</color>
+    <color name="item_background_dark">#FFFFFF</color>
+    <color name="text_color_primary">@android:color/primary_text_light</color>
+    <color name="text_color_secondary">#484C4F</color>
+    <color name="text_color_thirdly">#9DA0A2</color>
+    <color name="divider">#f2f3f5</color>
+    <color name="drawer_menu_item_text_color">#484C4F</color>
+    <color name="drawer_menu_group_text_color">#999999</color>
+    <color name="tab_indicator">@android:color/white</color>
+    <color name="tab_text">#a0ffffff</color>
+    <color name="toolbar">@android:color/white</color>
+    <color name="toolbar_disabled">#77e0e0e0</color>
+    <color name="console_debug">#cc000000</color>
+    <color name="console_verbose">#dfc0c0c0</color>
+
+
+
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 504dead0..0d5ffaf7 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,11 +1,11 @@
 <resources>
-    <string name="_app_name">Auto.js</string>
+    <string name="app_name">Auto.js</string>
     <string name="text_new_file">新建文件</string>
     <string name="text_create_fail">创建失败</string>
     <string name="text_please_input_name">请输入名称</string>
     <string name="text_name">名称</string>
     <string name="text_go_to_setting">去设置</string>
-    <string name="explain_accessibility_permission">软件需要打开\"无障碍服务\"才能运行，请在随后的设置中选择\"AutoJs\"并开启服务。\n您也可以稍后在侧拉菜单中设置。</string>
+    <string name="explain_accessibility_permission">软件需要打开\"无障碍服务\"才能运行，请在随后的设置中选择\"Auto.js\"并开启服务。\n您也可以稍后在侧拉菜单中设置。</string>
     <string name="text_cancel">取消</string>
     <string name="text_path_is_empty">路径为空</string>
     <string name="text_file_not_exists">文件不存在</string>
@@ -27,7 +27,7 @@
     <string name="text_about">关于</string>
     <string name="text_licenses">开放源代码许可</string>
     <string name="text_do_not_remind_again">不再提示</string>
-    <string name="copyright">Copyright©2016 All right reserves.</string>
+    <string name="copyright">Copyright©2018-2019 All right reserves.</string>
     <string name="developer">星尘幻影</string>
     <string name="qq" translatable="false">2732014414</string>
     <string name="email" translatable="false">hybbbb1996@gmail.com</string>
@@ -35,7 +35,7 @@
     <string name="text_already_copy_to_clip">已复制到剪贴板</string>
     <string name="donate_developer">打赏作者</string>
     <string name="my_github">https://github.com/hyb1996/NoRootScriptDroid</string>
-    <string name="share_app">[AutoJs]下载地址：http://www.coolapk.com/apk/org.autojs.autojs </string>
+    <string name="share_app">[Auto.js]下载地址：http://www.coolapk.com/apk/org.autojs.autojs </string>
     <string name="text_floating_window">悬浮窗</string>
     <string name="text_error_report">错误报告</string>
     <string name="text_press_again_to_exit">再按一次退出程序</string>
@@ -99,7 +99,7 @@
     <string name="text_import_succeed">导入成功</string>
     <string name="text_current_activity">当前活动:</string>
     <string name="text_current_package">当前应用包名:</string>
-    <string name="go_to_accessibility_settings"><![CDATA[请打开设置->无障碍服务->AutoJs并开启]]></string>
+    <string name="go_to_accessibility_settings"><![CDATA[请打开设置->无障碍服务->Auto.js并开启]]></string>
     <string name="text_script_running">脚本运行</string>
     <string name="key_use_volume_control_running">key_use_volume_control_running</string>
     <string name="text_use_volume_to_stop_running">音量上键停止所有脚本</string>
@@ -273,7 +273,7 @@
     <string name="text_reset_succeed">重置成功</string>
     <string name="text_cannot_read_file">无法读取文件</string>
     <string name="text_service">服务</string>
-    <string name="text_notification_permission">通知权限</string>
+    <string name="text_notification_permission">通知读取权限</string>
 
 
     <string name="text_open_main_activity">打开主界面</string>
@@ -424,4 +424,18 @@
     <string name="error_pattern_syntax">正则表达式错误</string>
     <string name="text_invalid_package_name">非法包名</string>
     <string name="error_cannot_rename">重命名失败</string>
+    <string name="text_project_save_success">项目已经保存到%s</string>
+    <string name="text_project_save_error">项目保存失败 %s</string>
+    <string name="text_night_mode">夜间模式</string>
+    <string name="key_night_mode">key_night_mode</string>
+    <string name="text_run_on_startup">Auto.js启动时</string>
+    <string name="text_usage_stats_permission">查看使用统计权限</string>
+    <string name="description_usage_stats_permission">通过\"查看使用统计\"权限可以获取本设备过去使用应用的情况，从而使获取当前应用(currentPackage)时更准确。</string>
+    <string name="text_gesture_observing">手势监听</string>
+    <string name="summary_gesture_observing">开启后将支持events手势事件，但Auto.js崩溃时可能会导致屏幕失灵</string>
+    <string name="text_open_with">打开方式</string>
+    <plurals name="air_error_short_description" key="air_error_short_description">
+        <item quantity="one">描述至少要 %d 个字.</item>
+        <item quantity="other">描述至少要 %d 个字.</item>
+    </plurals>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index d20bc30d..c7d18c25 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,10 +1,24 @@
 <resources>
 
-    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
+
+    <style name="AppTheme" parent="Theme.AppCompat.DayNight.NoActionBar">
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</item>
+        <item name="android:textColorPrimary">@color/text_color_secondary</item>
+        <item name="android:textColorSecondary">@color/text_color_thirdly</item>
+        <item name="android:windowBackground">@color/window_background</item>
+        <item name="android:itemBackground">@color/item_background</item>
+        <item name="itemBackgroundDark">@color/item_background_dark</item>
+        <item name="android:divider">@color/divider</item>
+        <item name="drawer_item_text_color">@color/drawer_menu_item_text_color</item>
+        <item name="drawer_group_text_color">@color/drawer_menu_group_text_color</item>
+    </style>
 
+    <style name="ToolBarStyle" parent="ThemeOverlay.AppCompat.ActionBar">
+        <item name="android:textColorPrimary">@color/toolbar</item>
+        <item name="android:textColorSecondary">@color/toolbar</item>
+        <item name="actionMenuTextColor">@color/toolbar</item>
     </style>
 
     <style name="EditorTheme" parent="AppTheme">
@@ -13,15 +27,12 @@
     </style>
 
     <style name="AppTheme.FullScreen" parent="AppTheme">
-        <!-- Customize your theme here. -->
         <item name="windowNoTitle">true</item>
-
         <item name="windowActionBar">false</item>
     </style>
 
     <style name="AppTheme.Splash" parent="@android:style/Theme.Light.NoTitleBar.Fullscreen">
         <item name="windowNoTitle">true</item>
-
         <item name="windowActionBar">false</item>
     </style>
 
@@ -42,7 +53,6 @@
         <item name="android:backgroundDimEnabled">false</item>
     </style>
 
-
     <style name="IssueReporterTheme" parent="Theme.AppCompat.Light.NoActionBar">
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
@@ -53,9 +63,11 @@
 
     </style>
 
-    <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar"/>
-
-    <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar"/>
+    <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.ActionBar"/>
 
+    <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.ActionBar">
+        <item name="android:textColorPrimary">#212121</item>
+        <item name="android:textColorSecondary">@color/colorAccent</item>
+    </style>
 
 </resources>
diff --git a/app/src/main/res/values/theme_colors.xml b/app/src/main/res/values/theme_colors.xml
index aecb3619..c7f9a9d4 100644
--- a/app/src/main/res/values/theme_colors.xml
+++ b/app/src/main/res/values/theme_colors.xml
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="theme_color_red">基佬红</string>
-    <string name="theme_color_pink">基佬粉</string>
-    <string name="theme_color_purple">基佬紫</string>
-    <string name="theme_color_dark_purple">基深紫</string>
-    <string name="theme_color_indigo">基靛蓝</string>
-    <string name="theme_color_blue">基佬蓝</string>
-    <string name="theme_color_light_blue">基亮蓝</string>
-    <string name="theme_color_blue_green">基蓝绿</string>
-    <string name="theme_color_cyan">基佬青</string>
-    <string name="theme_color_green">基佬绿</string>
-    <string name="theme_color_light_green">基亮绿</string>
-    <string name="theme_color_yellow_green">基黄绿</string>
-    <string name="theme_color_yellow">基佬黄</string>
-    <string name="theme_color_amber">基琥珀</string>
-    <string name="theme_color_orange">基佬橙</string>
-    <string name="theme_color_dark_orange">基深橙</string>
-    <string name="theme_color_brown">基佬棕</string>
-    <string name="theme_color_gray">基佬灰</string>
-    <string name="theme_color_blue_gray">基蓝灰</string>
+    <string name="theme_color_red">红色</string>
+    <string name="theme_color_pink">粉色</string>
+    <string name="theme_color_purple">紫色</string>
+    <string name="theme_color_dark_purple">深紫</string>
+    <string name="theme_color_indigo">靛蓝</string>
+    <string name="theme_color_blue">蓝色</string>
+    <string name="theme_color_light_blue">亮蓝</string>
+    <string name="theme_color_blue_green">蓝绿</string>
+    <string name="theme_color_cyan">青色</string>
+    <string name="theme_color_green">绿色</string>
+    <string name="theme_color_light_green">亮绿</string>
+    <string name="theme_color_yellow_green">黄绿</string>
+    <string name="theme_color_yellow">黄色</string>
+    <string name="theme_color_amber">琥珀</string>
+    <string name="theme_color_orange">橙色</string>
+    <string name="theme_color_dark_orange">深橙</string>
+    <string name="theme_color_brown">棕色</string>
+    <string name="theme_color_gray">灰色</string>
+    <string name="theme_color_blue_gray">蓝灰</string>
 
 
     <color name="theme_color_red">#F44336</color>
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index 64e91a68..de479f97 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -7,7 +7,6 @@
         android:title="@string/text_script_record"
         android:widgetLayout="@layout/preference_custom">
 
-
         <com.stardust.theme.preference.ThemeColorSwitchPreference
             android:defaultValue="false"
             android:key="@string/key_use_volume_control_record"
@@ -90,27 +89,6 @@
             />
     </com.stardust.theme.preference.ThemeColorPreferenceCategory>
 
-    <com.stardust.theme.preference.ThemeColorPreferenceCategory
-        android:layout="@layout/preference_category_custom"
-        android:title="@string/text_ad">
-        <com.afollestad.materialdialogs.prefs.MaterialListPreference
-            android:defaultValue="0"
-            android:entries="@array/ad_types_keys"
-            android:entryValues="@array/ad_types_values"
-            android:key="@string/key_ad_type"
-            android:layout="@layout/preference_custom"
-            android:title="@string/text_ad_type_settings"
-            />
-        <com.afollestad.materialdialogs.prefs.MaterialListPreference
-            android:defaultValue="@string/text_default"
-            android:entries="@array/ad_showing_mode_keys"
-            android:entryValues="@array/ad_showing_mode_values"
-            android:key="@string/key_ad_showing_mode"
-            android:layout="@layout/preference_custom"
-            android:title="@string/text_ad_showing_settings"
-            />
-    </com.stardust.theme.preference.ThemeColorPreferenceCategory>
-
     <com.stardust.theme.preference.ThemeColorPreferenceCategory
         android:layout="@layout/preference_category_custom"
         android:title="@string/text_others">
@@ -124,14 +102,14 @@
             />
 
         <org.autojs.autojs.ui.settings.ScriptDirPathPreference
+            android:defaultValue="@string/default_value_script_dir_path"
             android:entries="@array/keys_documentation_source"
             android:entryValues="@array/values_documentation_source"
             android:key="@string/key_script_dir_path"
-            android:defaultValue="@string/default_value_script_dir_path"
             android:layout="@layout/preference_custom"
             android:title="@string/text_change_script_dir"
             />
-            android:
+        android:
     </com.stardust.theme.preference.ThemeColorPreferenceCategory>
 
     <com.stardust.theme.preference.ThemeColorPreferenceCategory
diff --git a/autojs/build.gradle b/autojs/build.gradle
index f2f46717..58a0a2b9 100644
--- a/autojs/build.gradle
+++ b/autojs/build.gradle
@@ -1,4 +1,6 @@
 apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-android-extensions'
 
 android {
     compileSdkVersion versions.compile
@@ -10,7 +12,7 @@ android {
         versionCode 1
         versionName "1.0"
 
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
     }
     buildTypes {
@@ -35,7 +37,7 @@ repositories {
 }
 
 dependencies {
-    androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
+    androidTestImplementation('androidx.test.espresso:espresso-core:3.1.1-alpha01', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
     testImplementation 'junit:junit:4.12'
@@ -45,7 +47,7 @@ dependencies {
     api('com.afollestad.material-dialogs:core:0.9.2.3', {
         exclude group: 'com.android.support'
     })
-    api 'com.android.support:design:28.0.0'
+    api 'com.google.android.material:material:1.1.0-alpha01'
     api 'com.github.hyb1996:EnhancedFloaty:0.31'
     api 'com.github.hyb1996:OpenCvLib:2.4.13.4-imgproc'
     api 'com.makeramen:roundedimageview:2.3.0'
@@ -57,6 +59,9 @@ dependencies {
     api 'com.github.Stericson:RootShell:1.6'
     // Gson
     api 'com.google.code.gson:gson:2.8.2'
+    // log4j
+    api group: 'de.mindpipe.android', name: 'android-logging-log4j', version: '1.0.3'
+    api group: 'log4j', name: 'log4j', version: '1.2.17'
     // Terminal emulator
     api(name: 'libtermexec-release', ext: 'aar')
     api(name: 'emulatorview-release', ext: 'aar')
diff --git a/autojs/src/androidTest/java/com/stardust/autojs/ExampleInstrumentedTest.java b/autojs/src/androidTest/java/com/stardust/autojs/ExampleInstrumentedTest.java
index 4ad83ee2..dc8efbed 100644
--- a/autojs/src/androidTest/java/com/stardust/autojs/ExampleInstrumentedTest.java
+++ b/autojs/src/androidTest/java/com/stardust/autojs/ExampleInstrumentedTest.java
@@ -1,22 +1,11 @@
 package com.stardust.autojs;
 
-import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import java.io.File;
-import java.io.IOException;
-
-import okhttp3.MediaType;
-import okhttp3.MultipartBody;
-import okhttp3.OkHttpClient;
-import okhttp3.Request;
-import okhttp3.RequestBody;
-import okhttp3.Response;
-
 import static org.junit.Assert.assertEquals;
 
 /**
diff --git a/autojs/src/main/AndroidManifest.xml b/autojs/src/main/AndroidManifest.xml
index bf47a035..034707df 100644
--- a/autojs/src/main/AndroidManifest.xml
+++ b/autojs/src/main/AndroidManifest.xml
@@ -15,21 +15,32 @@
         <activity
             android:name=".execution.ScriptExecuteActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
-            android:theme="@style/AppTheme"/>
+            android:theme="@style/ScriptTheme"/>
 
 
         <activity
             android:name="com.stardust.autojs.core.permission.PermissionRequestActivity"
             android:excludeFromRecents="true"
             android:taskAffinity="com.stardust.autojs.runtime.api.image.ScreenCaptureRequestActivity"
-            android:theme="@style/AppTheme.Transparent"/>
+            android:theme="@style/ScriptTheme.Transparent"/>
 
         <activity
             android:name="com.stardust.autojs.core.image.capture.ScreenCaptureRequestActivity"
             android:excludeFromRecents="true"
             android:taskAffinity="com.stardust.autojs.runtime.api.image.ScreenCaptureRequestActivity"
-            android:theme="@style/AppTheme.Transparent"/>
+            android:theme="@style/ScriptTheme.Transparent"/>
 
+        <service
+            android:name="com.stardust.autojs.core.accessibility.AccessibilityService"
+            android:permission="android.permission.BIND_ACCESSIBILITY_SERVICE">
+            <intent-filter>
+                <action android:name="android.accessibilityservice.AccessibilityService"/>
+            </intent-filter>
+
+            <meta-data
+                android:name="android.accessibilityservice"
+                android:resource="@xml/accessibility_service_config"/>
+        </service>
 
     </application>
 
diff --git a/autojs/src/main/assets/init.js b/autojs/src/main/assets/init.js
index 0945ee00..78883805 100644
--- a/autojs/src/main/assets/init.js
+++ b/autojs/src/main/assets/init.js
@@ -2,64 +2,73 @@ var global = this;
 
 runtime.init();
 
-(function(){
+(function () {
     //重定向importClass使得其支持字符串参数
     global.importClass =
-    (function(){
-        var __importClass__ = importClass;
-        return function(pack){
-            if(typeof(pack) == "string"){
-                __importClass__(Packages[pack]);
-            }else{
-                __importClass__(pack);
+        (function () {
+            var __importClass__ = importClass;
+            return function (pack) {
+                if (typeof (pack) == "string") {
+                    __importClass__(Packages[pack]);
+                } else {
+                    __importClass__(pack);
+                }
             }
-        }
-    })();
+        })();
 
-
-    //初始化不依赖环境的模块
-    global.Promise = require('promise.js');
-    global.JSON = require('__json2__.js');
-    global.util = require('__util__.js');
-    global.device = runtime.device;
-
-    //设置JavaScriptBridges用于与Java层的交互和数据转换
-    runtime.bridges.setBridges(require('__bridges__.js'));
-
-    //一些内部函数
-    global.__asGlobal__ = function(obj, functions){
+    //内部函数
+    global.__asGlobal__ = function (obj, functions) {
         var len = functions.length;
-        for(var i = 0; i < len; i++) {
+        for (var i = 0; i < len; i++) {
             var funcName = functions[i];
-            global[funcName] = obj[funcName].bind(obj);
+            var func = obj[funcName]
+            if (!func) {
+                continue;
+            }
+            (function (obj, funcName, func) {
+                global[funcName] = function () {
+                    return func.apply(obj, arguments);
+                };
+            })(obj, funcName, func);
         }
     }
 
-    global.__exitIfError__ = function(action, defReturnValue){
-        try{
-           return action();
-        }catch(err){
-            if(err instanceof java.lang.Throwable){
+    global.__exitIfError__ = function (action, defReturnValue) {
+        try {
+            return action();
+        } catch (err) {
+            if (err instanceof java.lang.Throwable) {
                 exit(err);
-            }else if(err instanceof Error){
+            } else if (err instanceof Error) {
                 exit(new org.mozilla.javascript.EvaluatorException(err.name + ": " + err.message, err.fileName, err.lineNumber));
-                //new java.lang.RuntimeException(err.name + ": " + err.message + "\n" + err.stack));
-            }else{
+            } else {
                 exit();
             }
             return defReturnValue;
         }
     };
 
+     // 初始化基础模块
+     global.timers = require('__timers__.js')(runtime, global);
+
+     //初始化不依赖环境的模块
+     global.JSON = require('__json2__.js');
+     global.util = require('__util__.js');
+     global.device = runtime.device;
+     global.Promise = require('promise.js');
+ 
+     //设置JavaScriptBridges用于与Java层的交互和数据转换
+     runtime.bridges.setBridges(require('__bridges__.js'));
+
     //初始化全局函数
     require("__globals__")(runtime, global);
     //初始化一般模块
-    (function(scope){
+    (function (scope) {
         var modules = ['app', 'automator', 'console', 'dialogs', 'io', 'selector', 'shell', 'web', 'ui',
-            "images", "timers", "threads", "events", "engines", "RootAutomator", "http", "storages", "floaty",
-            "sensors", "media"];
+            "images", "threads", "events", "engines", "RootAutomator", "http", "storages", "floaty",
+            "sensors", "media", "plugins", "continuation"];
         var len = modules.length;
-        for(var i = 0; i < len; i++) {
+        for (var i = 0; i < len; i++) {
             var m = modules[i];
             scope[m] = require('__' + m + '__')(scope.runtime, scope);
         }
diff --git a/autojs/src/main/assets/modules/__app__.js b/autojs/src/main/assets/modules/__app__.js
index f0b16fb2..9d0573a5 100644
--- a/autojs/src/main/assets/modules/__app__.js
+++ b/autojs/src/main/assets/modules/__app__.js
@@ -1,107 +1,153 @@
 
-module.exports = function(runtime, global){
+module.exports = function (runtime, global) {
     importClass(android.content.Intent);
     var app = Object.create(runtime.app);
     var context = global.context;
 
-    app.intent = function(i) {
-      var intent = new android.content.Intent();
-      if (i.className && i.packageName) {
-          intent.setClassName(i.packageName, i.className);
-      }
-      if (i.extras) {
-          for (var key in i.extras) {
-              intent.putExtra(key, i.extras[key]);
-          }
-      }
-      if (i.category) {
-          if(i.category instanceof Array){
-              for(var j = 0; i < i.category.length; j++){
-                  intent.addCategory(i.category[j]);
-              }
-          }else{
-              intent.addCategory(i.category);
-          }
-      }
-      if (i.action) {
-          if(i.action.indexOf(".") == -1){
-              i.action = "android.intent.action." + i.action;
-          }
-          intent.setAction(i.action);
-      }
-      if (i.type) {
-          if(i.data){
-              intent.setDataAndType(android.net.Uri.parse(i.data), i.type);
-          }else{
-              intent.setType(i.type);
-          }
-      }else if (i.data) {
-          intent.setData(android.net.Uri.parse(i.data));
-      }
-      return intent;
+    app.intent = function (i) {
+        var intent = new android.content.Intent();
+        if (i.className && i.packageName) {
+            intent.setClassName(i.packageName, i.className);
+        }
+        if (i.extras) {
+            for (var key in i.extras) {
+                intent.putExtra(key, i.extras[key]);
+            }
+        }
+        if (i.category) {
+            if (i.category instanceof Array) {
+                for (var j = 0; i < i.category.length; j++) {
+                    intent.addCategory(i.category[j]);
+                }
+            } else {
+                intent.addCategory(i.category);
+            }
+        }
+        if (i.action) {
+            if (i.action.indexOf(".") == -1) {
+                i.action = "android.intent.action." + i.action;
+            }
+            intent.setAction(i.action);
+        }
+        if (i.flags) {
+            let flags = 0;
+            if (Array.isArray(i.flags)) {
+                for (let j = 0; j < i.flags.length; j++) {
+                    flags |= parseIntentFlag(i.flags[j]);
+                }
+            } else {
+                flags = parseIntentFlag(i.flags);
+            }
+            intent.setFlags(flags);
+        }
+        if (i.type) {
+            if (i.data) {
+                intent.setDataAndType(android.net.Uri.parse(i.data), i.type);
+            } else {
+                intent.setType(i.type);
+            }
+        } else if (i.data) {
+            intent.setData(android.net.Uri.parse(i.data));
+        }
+        return intent;
     }
 
-    app.startActivity = function(i){
-        if(typeof(i) == "string"){
-            if(runtime.getProperty("class." + i)){
+    app.startActivity = function (i) {
+        if (typeof (i) == "string") {
+            if (runtime.getProperty("class." + i)) {
                 context.startActivity(new Intent(context, runtime.getProperty("class." + i))
-                        .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
+                    .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
                 return;
-            }else{
+            } else {
                 throw new Error("class " + i + " not found");
             }
         }
-        context.startActivity(app.intent(i).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
+        if(i instanceof android.content.Intent){
+            context.startActivity(i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
+            return;
+        }
+        if(i && i.root) {
+            shell("am start " + app.intentToShell(i), true);
+        }else{
+            context.startActivity(app.intent(i).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
+        }
+
     }
 
-    app.sendBroadcast = function(i){
-        if(typeof(i) == "string"){
-            if(runtime.getProperty("broadcast." + i)){
-                app.sendLocalBroadcastSync(app.intent({action: runtime.getProperty("broadcast." + i)}));
+    app.sendBroadcast = function (i) {
+        if (typeof (i) == "string") {
+            if (runtime.getProperty("broadcast." + i)) {
+                app.sendLocalBroadcastSync(app.intent({ action: runtime.getProperty("broadcast." + i) }));
             }
         }
-        context.sendBroadcast(app.intent(i));
+        if(i && i.root) {
+            shell("am broadcast " + app.intentToShell(i), true);
+        }else{
+            context.sendBroadcast(app.intent(i));
+        }
     }
 
-    app.sendEmail = function(options){
+    app.startService = function(i) {
+        if(i && i.root) {
+            shell("am startservice " + app.intentToShell(i), true);
+        }else{
+            context.startService(app.intent(i));
+        }
+    }
+
+    app.sendEmail = function (options) {
         options = options || {};
         var i = new Intent(Intent.ACTION_SEND);
-        if(options.email){
+        if (options.email) {
             i.putExtra(Intent.EXTRA_EMAIL, toArray(options.email));
         }
-        if(options.cc){
+        if (options.cc) {
             i.putExtra(Intent.EXTRA_CC, toArray(options.cc));
         }
-        if(options.bcc){
+        if (options.bcc) {
             i.putExtra(Intent.EXTRA_BCC, toArray(options.bcc));
         }
-        if(options.subject){
+        if (options.subject) {
             i.putExtra(Intent.EXTRA_SUBJECT, options.subject);
         }
-        if(options.text){
+        if (options.text) {
             i.putExtra(Intent.EXTRA_TEXT, options.text);
         }
-        if(options.attachment){
-            i.putExtra(Intent.EXTRA_STREAM, android.content.Uri.parse("file://" + options.attachment));
+        if (options.attachment) {
+            i.putExtra(Intent.EXTRA_STREAM, app.parseUri(options.attachment));
         }
         i.setType("message/rfc822");
         context.startActivity(Intent.createChooser(i, "发送邮件").addFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
     }
 
-    function toArray(arg){
-        if(typeof(arg) == 'string'){
+    function toArray(arg) {
+        if (typeof (arg) == 'string') {
             arg = [arg];
         }
         let arr = util.java.array("string", arg.length);
-        for(let i = 0; i < arg.length; i++){
+        for (let i = 0; i < arg.length; i++) {
             arr[i] = arg;
         }
         return arr;
     }
 
-    app.getUriForFile = function(file){
+    app.parseUri = function (uri) {
+        if (uri.startsWith("file://")) {
+            return app.getUriForFile(uri);
+        }
+        return android.net.Uri.parse(uri);
+    }
+
+    app.getUriForFile = function (path) {
+        if (path.startsWith("file://")) {
+            path = path.substring(7);
+        }
+        let file = new java.io.File(files.path(path));
+        if (app.fileProviderAuthority == null) {
+            return android.net.Uri.fromFile(file);
+        }
         return android.support.v4.content.FileProvider.getUriForFile(context,
-            "org.autojs.autojs.fileprovider", new java.io.File(files.path(path)));
+            app.fileProviderAuthority, file);
     };
 
     app.launch = app.launchPackage;
@@ -114,8 +160,110 @@ module.exports = function(runtime, global){
         versionName: org.autojs.autojs.BuildConfig.VERSION_NAME
     };
 
+    app.intentToShell = function(i) {
+        var cmd = "";
+        function quoteStr(str) {
+            return "'" + str.replace("'", "\\'") + "'";
+        }
+        function isInt(value) {
+            return Bumber.isInteger(value) && value <= java.lang.Integer.MAX_VALUE && value >= java.lang.Integer.MIN_VALUE;
+        }
+        function typeChar(value){
+            if(typeof(value) == 'boolean'){
+                return 'z';
+            }
+            if(typeof(value) == 'number'){
+                if(Number.isInteger(value)){
+                    if(isInt(value)){
+                        return 'i';
+                    }else{
+                        return 'l';
+                    }
+                }else{
+                    return 'f';
+                }
+            }
+            throw new TypeError("unknown type: " + value);
+        }
+        function addOption(option, param, quote) {
+            if(quote == undefined || quote === true){
+                param = quoteStr(param);
+            }
+            cmd += " -" + option + " " + param;
+        }
+        if (i.className && i.packageName) {
+           addOption("n", i.packageName + "/" + i.className);
+        }
+        if (i.extras) {
+            for (var key in i.extras) {
+                let value = i.extras[key];
+                if(typeof(value) == 'string'){
+                    addOption("-es",  quoteStr(key) + ' ' + quoteStr(value), false);
+                }else if(Array.isArray(value)){
+                    if(value.length == 0){
+                        throw new Error('Empty array: ' + key);
+                    }
+                    var e = value[0];
+                    if(typeof(e) == 'string'){
+                        cmd += ' --esa ' + quoteStr(key) + ' ';
+                        for(let str of value){
+                            cmd += quoteStr(str) + ',';
+                        }
+                        cmd = cmd.substring(0, cmd.length - 1);
+                    }else{
+                        addOption('-e' + typeChar(e) + 'a', quoteStr(key) + ' ' + value, false);
+                    }
+                }else {
+                    addOption('-e' + typeChar(value), quoteStr(key) + ' ' + value, false);
+                }
+            }
+        }
+        if (i.category) {
+            if (i.category instanceof Array) {
+                for (var j = 0; i < i.category.length; j++) {
+                    addOption('c', i.category[j], false);
+                }
+            } else {
+                addOption('c', i.category, false);
+            }
+        }
+        if (i.action) {
+            if (i.action.indexOf(".") == -1) {
+                i.action = "android.intent.action." + i.action;
+            }
+            addOption('a', i.action);
+        }
+        if (i.flags) {
+            let flags = 0;
+            if (Array.isArray(i.flags)) {
+                for (let j = 0; j < i.flags.length; j++) {
+                    flags |= parseIntentFlag(i.flags[j]);
+                }
+            } else {
+                flags = parseIntentFlag(i.flags);
+            }
+            addOption('f', flags, false);
+        }
+        if (i.type) {
+            addOption('t', i.type, false);
+        }
+        if (i.data) {
+            addOption('d', i.data, false);
+        }
+        return cmd;
+    }
+
+    
+
     global.__asGlobal__(app, ['launchPackage', 'launch', 'launchApp', 'getPackageName', 'getAppName', 'openAppSetting']);
 
+    function parseIntentFlag(flag) {
+        if (typeof (flag) == 'string') {
+            return android.content.Intent["FLAG_" + flag.toUpperCase()];
+        }
+        return flag;
+    }
+
     return app;
 }
 
diff --git a/autojs/src/main/assets/modules/__automator__.js b/autojs/src/main/assets/modules/__automator__.js
index b6d45bbd..484f0629 100644
--- a/autojs/src/main/assets/modules/__automator__.js
+++ b/autojs/src/main/assets/modules/__automator__.js
@@ -110,7 +110,8 @@ module.exports = function(runtime, global){
     }
 
     const flagsMap = {
-        "findOnUiThread": 1
+        "findOnUiThread": 1,
+        "useUsageStats": 2
     };
 
     var auto = function(mode){
diff --git a/autojs/src/main/assets/modules/__bridges__.js b/autojs/src/main/assets/modules/__bridges__.js
index 0a06cf4e..f6f0ee34 100644
--- a/autojs/src/main/assets/modules/__bridges__.js
+++ b/autojs/src/main/assets/modules/__bridges__.js
@@ -50,6 +50,25 @@ bridges.toArray = function (iterable) {
     }
     return arr;
 };
+
+bridges.asArray = function (list) {
+    var arr = [];
+    for (var i = 0; i < list.size(); i++) {
+        arr.push(list.get(i));
+    }
+    for (var key in list) {
+        if (typeof (key) == 'number')
+            continue;
+        var v = list[key];
+        if (typeof (v) == 'function') {
+            arr[key] = v.bind(list);
+        } else {
+            arr[key] = v;
+        }
+    }
+    return arr;
+};
+
 bridges.toString = function (o) {
     return String(o);
 };
diff --git a/autojs/src/main/assets/modules/__console__.js b/autojs/src/main/assets/modules/__console__.js
index e007c093..4e9e8491 100644
--- a/autojs/src/main/assets/modules/__console__.js
+++ b/autojs/src/main/assets/modules/__console__.js
@@ -1,43 +1,82 @@
 
-module.exports = function(__runtime__, scope){
-    var rtConsole = __runtime__.console;
+module.exports = function (runtime, scope) {
+    var rtConsole = runtime.console;
     var console = {};
 
-    console.assert = function(value, message){
+    console.assert = function (value, message) {
         message = message || "";
         rtConsole.assertTrue(value, message);
     }
 
     console.rawInput = rtConsole.rawInput.bind(rtConsole);
 
-    console.input = function(data, param){
+    console.input = function (data, param) {
         return eval(console.rawInput.call(console, [].slice(arguments)) + "");
     }
 
-    console.log = function(){
+    console.log = function () {
         rtConsole.log(util.format.apply(util, arguments));
     }
 
-    console.verbose = function(){
+    console.verbose = function () {
         rtConsole.verbose(util.format.apply(util, arguments));
     }
 
-    console.print = function(){
+    console.print = function () {
         rtConsole.print(android.util.Log.DEBUG, util.format.apply(util, arguments));
     }
 
-    console.info = function(){
+    console.info = function () {
         rtConsole.info(util.format.apply(util, arguments));
     }
 
-    console.warn = function(){
+    console.warn = function () {
         rtConsole.warn(util.format.apply(util, arguments));
     }
 
-    console.error = function(){
+    console.error = function () {
         rtConsole.error(util.format.apply(util, arguments));
     }
 
+    var timers = {}, ascu = android.os.SystemClock.uptimeMillis;
+    console.time = console.time || function (label) {
+        label = label || "default";
+        timers[label] = ascu();
+    }
+
+    console.timeEnd = console.timeEnd || function (label) {
+        label = label || "default";
+        var result = ascu() - timers[label];
+        delete timers[label];
+        console.log(label + ": " + result + "ms");
+    }
+
+    console.trace = console.trace || function captureStack(message) {
+        var k = {};
+        Error.captureStackTrace(k, captureStack);
+        console.log(util.format.apply(util, arguments) + "\n" + k.stack);
+    };
+
+    console.setGlobalLogConfig = function (config) {
+        let logConfigurator = new Packages["de.mindpipe.android.logging.log4j"].LogConfigurator();
+        if (config.file) {
+            logConfigurator.setFileName(files.path(config.file));
+            logConfigurator.setUseFileAppender(true);
+        }
+        logConfigurator.setFilePattern(option(config.filePattern, "%m%n"))
+        logConfigurator.setMaxFileSize(option(config.maxFileSize, 512 * 1024));
+        logConfigurator.setImmediateFlush(option(config.immediateFlush, true));
+        let rootLevel = option(config.rootLevel, "ALL");
+        logConfigurator.setRootLevel(org.apache.log4j.Level[rootLevel.toUpperCase()]);
+        logConfigurator.setMaxBackupSize(option(config.maxBackupSize, 5));
+        logConfigurator.setResetConfiguration(option(config.resetConfiguration, true));
+        logConfigurator.configure();
+    }
+
+    function option(value, def) {
+        return value == undefined ? def : value;
+    }
+
     console.show = rtConsole.show.bind(rtConsole);
     console.hide = rtConsole.hide.bind(rtConsole);
     console.clear = rtConsole.clear.bind(rtConsole);
diff --git a/autojs/src/main/assets/modules/__continuation__.js b/autojs/src/main/assets/modules/__continuation__.js
new file mode 100644
index 00000000..15fa8a5b
--- /dev/null
+++ b/autojs/src/main/assets/modules/__continuation__.js
@@ -0,0 +1,64 @@
+module.exports = function (runtime, global) {
+    const Continuation = com.stardust.autojs.rhino.continuation.Continuation;
+
+    function continuation() {
+
+    }
+
+    continuation.create = function (scope) {
+        scope = scope || global;
+        var cont = Object.create(runtime.createContinuation(scope));
+        cont.await = function () {
+            let result = cont.suspend();
+            if (result.error != null) {
+                throw result.error;
+            }
+            return result.result;
+        };
+        cont.resumeError = function (error) {
+            if (error == null || error == undefined) {
+                throw TypeError("error is null or undefined");
+            }
+            cont.resumeWith(Continuation.Result.Companion.failure(error));
+        }
+        cont.resume = function (result) {
+            cont.resumeWith(Continuation.Result.Companion.success(result));
+        }
+        return cont;
+    }
+
+    function awaitPromise(scope, promise) {
+        var cont = continuation.create(scope);
+        promise.then(result => {
+            cont.resume(result);
+        }).catch(error => {
+            cont.resumeError(error);
+        });
+        return cont.await();
+    }
+
+    continuation.await = function (any) {
+        if (Object.getPrototypeOf(any).constructor === Promise) {
+            return awaitPromise(global, any);
+        }
+        throw new TypeError('cannot await ' + any);
+    }
+
+    continuation.delay = function (millis) {
+         var cont = continuation.create();
+         setTimeout(()=>{
+             cont.resume();
+         }, millis);
+         cont.await();
+     }
+
+    continuation.__defineGetter__('enabled', function () {
+        return engines.myEngine().hasFeature("continuation");
+    });
+
+    global.Promise.prototype.await = function () {
+        return continuation.await(this);
+    }
+
+    return continuation;
+}
\ No newline at end of file
diff --git a/autojs/src/main/assets/modules/__engines__.js b/autojs/src/main/assets/modules/__engines__.js
index ace4493b..9c428c78 100644
--- a/autojs/src/main/assets/modules/__engines__.js
+++ b/autojs/src/main/assets/modules/__engines__.js
@@ -18,17 +18,7 @@ module.exports = function(__runtime__, scope){
     }
 
     engines.myEngine = function(){
-        var engine = Object.create(rtEngines.myEngine());
-        if(!execArgv){
-            execArgv = {};
-            var iter = engine.getTag("execution.config").getArguments().entrySet().iterator();
-            while(iter.hasNext()){
-                var entry = iter.next();
-                execArgv[entry.getKey()] = entry.getValue();
-            }
-        }
-        engine.execArgv = execArgv;
-        return engine;
+        return rtEngines.myEngine();
     }
 
     engines.all = function(){
@@ -43,18 +33,11 @@ module.exports = function(__runtime__, scope){
         c = c || {};
         c.path = c.path || files.cwd();
         if(c.path){
-            if(Array.isArray(c.path)){
-                config.requirePath(c.path);
-                config.executePath(c.path[0]);
-            }else{
-                config.requirePath([c.path]);
-                config.executePath(c.path);
-            }
+           config.workingDirectory = c.path;
         }
-        c.delay = c.delay || 0;
-        c.interval = c.interval || 0;
-        c.loopTimes = c.loopTimes || 1;
-        config.loop(c.delay, c.loopTimes, c.interval);
+        config.delay = c.delay || 0;
+        config.interval = c.interval || 0;
+        config.loopTimes = c.loopTimes || 1;
         if(c.arguments){
             var arguments = c.arguments;
             for(var key in arguments){
@@ -66,5 +49,14 @@ module.exports = function(__runtime__, scope){
         return config;
     }
 
+    var engine = engines.myEngine();
+    var execArgv = {};
+    var iterator = engine.getTag("execution.config").arguments.entrySet().iterator();
+    while(iterator.hasNext()){
+        var entry = iterator.next();
+        execArgv[entry.getKey()] = entry.getValue();
+    }
+    engine.execArgv = execArgv;
+
     return engines;
 }
\ No newline at end of file
diff --git a/autojs/src/main/assets/modules/__globals__.js b/autojs/src/main/assets/modules/__globals__.js
index 794b7025..d285b362 100644
--- a/autojs/src/main/assets/modules/__globals__.js
+++ b/autojs/src/main/assets/modules/__globals__.js
@@ -9,7 +9,12 @@ module.exports = function(runtime, global){
         global.log(text);
     }
 
-    global.sleep = runtime.sleep.bind(runtime);
+    global.sleep = function(t) {
+        if(ui.isUiThread()){
+            throw new Error("不能在ui线程执行阻塞操作，请使用setTimeout代替");
+        }
+        runtime.sleep(t);
+    }
 
     global.isStopped = function(){
         return runtime.isStopped();
@@ -25,7 +30,6 @@ module.exports = function(runtime, global){
 
     global.exit = runtime.exit.bind(runtime);
 
-
     global.stop = global.exit;
 
     global.setClip = function(text){
@@ -47,6 +51,7 @@ module.exports = function(runtime, global){
     }
 
     global.waitForActivity = function(activity, period){
+        ensureNonUiThread();
         period = period || 200;
         while(global.currentActivity() != activity){
             sleep(period);
@@ -54,12 +59,19 @@ module.exports = function(runtime, global){
     }
 
     global.waitForPackage = function(packageName, period){
+        ensureNonUiThread();
         period = period || 200;
         while(global.currentPackage() != packageName){
             sleep(period);
         }
     }
 
+    function ensureNonUiThread() {
+        if(ui.isUiThread()){
+            throw new Error("不能在ui线程执行阻塞操作，请在子线程或子脚本执行，或者使用setInterval循环检测当前activity和package");
+        }
+    }
+
     global.random = function(min, max){
         if(arguments.length == 0){
             return Math.random();
diff --git a/autojs/src/main/assets/modules/__http__.js b/autojs/src/main/assets/modules/__http__.js
index 4332e8c9..551714d2 100644
--- a/autojs/src/main/assets/modules/__http__.js
+++ b/autojs/src/main/assets/modules/__http__.js
@@ -1,97 +1,107 @@
-module.exports = function(runtime, scope){
+module.exports = function (runtime, scope) {
     importPackage(Packages["okhttp3"]);
     importClass(com.stardust.autojs.core.http.MutableOkHttp);
     var http = {};
 
     http.__okhttp__ = new MutableOkHttp();
 
-    http.get = function(url, options, callback){
+    http.get = function (url, options, callback) {
         options = options || {};
         options.method = "GET";
         return http.request(url, options, callback);
     }
 
-    http.client = function(){
+    http.client = function () {
         return http.__okhttp__.client();
     }
 
-    http.post = function(url, data, options, callback){
+    http.post = function (url, data, options, callback) {
         options = options || {};
         options.method = "POST";
         options.contentType = options.contentType || "application/x-www-form-urlencoded";
-        if(data){
+        if (data) {
             fillPostData(options, data);
         }
         return http.request(url, options, callback);
     }
 
-    http.postJson = function(url, data, options, callback){
-       options = options || {};
-       options.contentType = "application/json";
-       return http.post(url, data, options, callback);
+    http.postJson = function (url, data, options, callback) {
+        options = options || {};
+        options.contentType = "application/json";
+        return http.post(url, data, options, callback);
     }
 
-    http.postMultipart = function(url, files, options, callback){
-       options = options || {};
-       options.method = "POST";
-       options.contentType = "multipart/form-data";
-       options.files = files;
-       return http.request(url, options, callback);
+    http.postMultipart = function (url, files, options, callback) {
+        options = options || {};
+        options.method = "POST";
+        options.contentType = "multipart/form-data";
+        options.files = files;
+        return http.request(url, options, callback);
     }
 
-    http.request = function(url, options, callback){
+    http.request = function (url, options, callback) {
+        var cont = null;
+        if (!callback && ui.isUiThread() && continuation.enabled) {
+            cont = continuation.create();
+        }
         var call = http.client().newCall(http.buildRequest(url, options));
-        if(!callback){
+        if (!callback && !cont) {
             return wrapResponse(call.execute());
         }
         call.enqueue(new Callback({
-            onResponse: function(call, res){
-                callback(wrapResponse(res));
+            onResponse: function (call, res) {
+                res = wrapResponse(res);
+                cont && cont.resume(res);
+                callback && callback(res);
             },
-            onFailure: function(call, ex){
-                callback(null, ex);
+            onFailure: function (call, ex) {
+                cont && cont.resumeError(ex);
+                callback && callback(null, ex);
             }
         }));
+        if (cont) {
+            return cont.await();
+        }
     }
 
-    http.buildRequest = function(url, options){
+    http.buildRequest = function (url, options) {
         var r = new Request.Builder();
-        if(!url.startsWith("http://") && !url.startsWith("https://")){
+        if (!url.startsWith("http://") && !url.startsWith("https://")) {
             url = "http://" + url;
         }
         r.url(url);
-        if(options.headers){
+        if (options.headers) {
             setHeaders(r, options.headers);
         }
-        if(options.body){
+        if (options.body) {
             r.method(options.method, parseBody(options, options.body));
-        }else if(options.files){
+        } else if (options.files) {
             r.method(options.method, parseMultipart(options.files));
-        }else {
+        } else {
             r.method(options.method, null);
         }
         return r.build();
     }
 
-    function parseMultipart(files){
+    function parseMultipart(files) {
         var builder = new MultipartBody.Builder()
             .setType(MultipartBody.FORM);
-        for(var key in files){
-            if(!files.hasOwnProperty(key)){
+        for (var key in files) {
+            if (!files.hasOwnProperty(key)) {
                 continue;
             }
             var value = files[key];
-            if(typeof(value) == 'string'){
+            if (typeof (value) == 'string') {
                 builder.addFormDataPart(key, value);
                 continue;
             }
             var path, mimeType, fileName;
-            if(typeof(value.getPath) == 'function'){
+            if (typeof (value.getPath) == 'function') {
                 path = value.getPath();
-            }else if(value.length == 2){
+            } else if (value.length == 2) {
                 fileName = value[0];
                 path = value[1];
-            }else if(value.length >= 3){
+            } else if (value.length >= 3) {
                 fileName = value[0];
                 mimeType = value[1]
                 path = value[2];
@@ -104,77 +114,77 @@ module.exports = function(runtime, scope){
         return builder.build();
     }
 
-    function parseMimeType(ext){
-        if(ext.length == 0){
+    function parseMimeType(ext) {
+        if (ext.length == 0) {
             return "application/octet-stream";
         }
         return android.webkit.MimeTypeMap.getSingleton().getMimeTypeFromExtension(ext)
             || "application/octet-stream";
     }
 
-    function fillPostData(options, data){
-        if(options.contentType == "application/x-www-form-urlencoded"){
+    function fillPostData(options, data) {
+        if (options.contentType == "application/x-www-form-urlencoded") {
             var b = new FormBody.Builder();
-            for(var key in data){
-                if(data.hasOwnProperty(key)){
+            for (var key in data) {
+                if (data.hasOwnProperty(key)) {
                     b.add(key, data[key]);
                 }
             }
             options.body = b.build();
-        }else if(options.contentType == "application/json"){
+        } else if (options.contentType == "application/json") {
             options.body = JSON.stringify(data);
-        }else{
+        } else {
             options.body = data;
         }
     }
 
-    function setHeaders(r, headers){
-      for(var key in headers){
-        if(headers.hasOwnProperty(key)){
-            let value = headers[key];
-            if(Array.isArray(value)){
-                value.forEach(v => {
-                    r.header(key, v);
-                });
-            }else{
-                r.header(key, value);
+    function setHeaders(r, headers) {
+        for (var key in headers) {
+            if (headers.hasOwnProperty(key)) {
+                let value = headers[key];
+                if (Array.isArray(value)) {
+                    value.forEach(v => {
+                        r.header(key, v);
+                    });
+                } else {
+                    r.header(key, value);
+                }
             }
         }
-      }
     }
 
-    function parseBody(options, body){
-        if(typeof(body) == "string"){
+    function parseBody(options, body) {
+        if (typeof (body) == "string") {
             body = RequestBody.create(MediaType.parse(options.contentType), body);
-        }else if(body instanceof RequestBody){
+        } else if (body instanceof RequestBody) {
             return body;
-        }else{
+        } else {
             body = new RequestBody({
-               contentType: function(){
-                   return MediaType.parse(options.contentType);
-               },
-               writeTo: body
-           });
+                contentType: function () {
+                    return MediaType.parse(options.contentType);
+                },
+                writeTo: body
+            });
         }
         return body;
     }
 
-    function wrapResponse(res){
+    function wrapResponse(res) {
         var r = {};
         r.statusCode = res.code();
         r.statusMessage = res.message();
         var headers = res.headers();
         r.headers = {};
-        for(var i = 0; i < headers.size(); i++){
+        for (var i = 0; i < headers.size(); i++) {
             let name = headers.name(i);
             let value = headers.value(i);
-            if(r.headers.hasOwnProperty(name)){
+            if (r.headers.hasOwnProperty(name)) {
                 let origin = r.headers[name];
-                if(!Array.isArray(origin)){
+                if (!Array.isArray(origin)) {
                     r.headers[name] = [origin];
                 }
                 r.headers[name].push(value);
-            }else{
+            } else {
                 r.headers[name] = value;
             }
         }
@@ -182,7 +192,7 @@ module.exports = function(runtime, scope){
         var body = res.body();
         r.body.string = body.string.bind(body);
         r.body.bytes = body.bytes.bind(body);
-        r.body.json = function(){
+        r.body.json = function () {
             return JSON.parse(r.body.string());
         }
         r.body.contentType = body.contentType();
diff --git a/autojs/src/main/assets/modules/__images__.js b/autojs/src/main/assets/modules/__images__.js
index e11814cc..587e10af 100644
--- a/autojs/src/main/assets/modules/__images__.js
+++ b/autojs/src/main/assets/modules/__images__.js
@@ -1,236 +1,436 @@
 
-module.exports = function(__runtime__, scope){
-   const defaultColorThreshold = 4;
+module.exports = function (runtime, scope) {
+    const ResultAdapter = require("result_adapter");
+    function images(){
+    }
+    if(android.os.Build.VERSION.SDK_INT >= 21){
+        util.__assignFunctions__(runtime.images, images, ['captureScreen', 'read', 'copy', 'load', 'clip', 'pixel'])
+    }
+    images.opencvImporter =  JavaImporter(
+         org.opencv.core.Point,
+         org.opencv.core.Point3,
+         org.opencv.core.Rect,
+         org.opencv.core.Algorithm,
+         org.opencv.core.Scalar,
+         org.opencv.core.Size,
+         org.opencv.core.Core,
+         org.opencv.core.CvException,
+         org.opencv.core.CvType,
+         org.opencv.core.TermCriteria,
+         org.opencv.core.RotatedRect,
+         org.opencv.core.Range,
+         org.opencv.imgproc.Imgproc,
+         com.stardust.autojs.core.opencv
+    );
+    with (images.opencvImporter) {
+        const defaultColorThreshold = 4;
 
-   var images = {};
-   var colors = Object.create(__runtime__.colors);
-   colors.alpha = function(color){
-        color = parseColor(color);
-        return color >>> 24;
-   }
-   colors.red = function(color){
-        color = parseColor(color);
-        return (color >> 16) & 0xFF;
-   }
-   colors.green = function(color){
-        color = parseColor(color);
-        return (color >> 8) & 0xFF;
-   }
-   colors.blue = function(color){
-        color = parseColor(color);
-        return color & 0xFF;
-   }
+        var colors = Object.create(runtime.colors);
+        colors.alpha = function (color) {
+            color = parseColor(color);
+            return color >>> 24;
+        }
+        colors.red = function (color) {
+            color = parseColor(color);
+            return (color >> 16) & 0xFF;
+        }
+        colors.green = function (color) {
+            color = parseColor(color);
+            return (color >> 8) & 0xFF;
+        }
+        colors.blue = function (color) {
+            color = parseColor(color);
+            return color & 0xFF;
+        }
 
-   colors.isSimilar = function(c1, c2, threshold, algorithm){
-        c1 = parseColor(c1);
-        c2 = parseColor(c2);
-        threshold = threshold == undefined ? 4 : threshold;
-        algorithm = algorithm == undefined ? "diff" : algorithm;
-        var colorDetector = getColorDetector(c1, algorithm, threshold);
-        return colorDetector.detectsColor(colors.red(c2), colors.green(c2), colors.blue(c2));
-   }
+        colors.isSimilar = function (c1, c2, threshold, algorithm) {
+            c1 = parseColor(c1);
+            c2 = parseColor(c2);
+            threshold = threshold == undefined ? 4 : threshold;
+            algorithm = algorithm == undefined ? "diff" : algorithm;
+            var colorDetector = getColorDetector(c1, algorithm, threshold);
+            return colorDetector.detectsColor(colors.red(c2), colors.green(c2), colors.blue(c2));
+        }
 
-   if(android.os.Build.VERSION.SDK_INT < 19){
+        var javaImages = runtime.getImages();
+
+        var colorFinder = javaImages.colorFinder;
+
+        images.requestScreenCapture = function(landscape) {
+            let ScreenCapturer = com.stardust.autojs.core.image.capture.ScreenCapturer;
+            var orientation = ScreenCapturer.ORIENTATION_AUTO;
+            if(landscape === true){
+                orientation = ScreenCapturer.ORIENTATION_LANDSCAPE;
+            }
+            if(landscape === false){
+                orientation = ScreenCapturer.ORIENTATION_PORTRAIT;
+            }
+            return ResultAdapter.wait(javaImages.requestScreenCapture(orientation));
+        }
+
+        images.save = function (img, path, format, quality) {
+            format = format || "png";
+            quality = quality == undefined ? 100 : quality;
+            return javaImages.save(img, path, format, quality);
+        }
+
+        images.saveImage = images.save;
+
+        images.grayscale = function (img, dstCn) {
+            return images.cvtColor(img, "BGR2GRAY", dstCn);
+        }
+
+        images.threshold = function (img, threshold, maxVal, type) {
+            initIfNeeded();
+            var mat = new Mat();
+            type = type || "BINARY";
+            type = Imgproc["THRESH_" + type];
+            Imgproc.threshold(img.mat, mat, threshold, maxVal, type);
+            return images.matToImage(mat);
+        }
+
+        images.inRange = function (img, lowerBound, upperBound) {
+            initIfNeeded();
+            var lb, ub;
+            if (typeof (lowerBound) == 'string') {
+                if (typeof (upperBound) == 'string') {
+                    lb = new Scalar(colors.red(lowerBound), colors.green(lowerBound),
+                        colors.blue(lowerBound), colors.alpha(lowerBound));
+                    ub = new Scalar(colors.red(upperBound), colors.green(upperBound),
+                        colors.blue(upperBound), colors.alpha(lowerBound));
+                } else if (typeof (upperBound) == 'number') {
+                    var color = lowerBound;
+                    var threshold = upperBound;
+                    lb = new Scalar(colors.red(color) - threshold, colors.green(color) - threshold,
+                        colors.blue(color) - threshold, colors.alpha(color));
+                    ub = new Scalar(colors.red(color) + threshold, colors.green(color) + threshold,
+                        colors.blue(color) + threshold, colors.alpha(color));
+                }else{
+                    throw new TypeError('lowerBound = ' + lowerBound, + 'upperBound = ' + upperBound);
+                }
+            }
+            var bi = new Mat();
+            Core.inRange(img.mat, lb, ub, bi);
+            return images.matToImage(bi);
+        }
+
+
+        images.adaptiveThreshold = function(img, maxValue, adaptiveMethod, thresholdType, blockSize, C){
+            initIfNeeded();
+            var mat = new Mat();
+            adaptiveMethod = Imgproc["ADAPTIVE_THRESH_" + adaptiveMethod];
+            thresholdType = Imgproc["THRESH_" + thresholdType];
+            Imgproc.adaptiveThreshold(img.mat, mat, maxValue, adaptiveMethod, thresholdType, blockSize, C);
+            return images.matToImage(mat);
+
+        }
+        images.blur = function (img, size, point, type) {
+            initIfNeeded();
+            var mat = new Mat();
+            size = newSize(size);
+            type = Imgproc["BORDER_" + (type || "CONSTANT")];
+            if (point == undefined) {
+                Imgproc.blur(img.mat, mat, size);
+            } else {
+                Imgproc.blur(img.mat, mat, size, new Point(point[0], point[1]), type);
+            }
+            return images.matToImage(mat);
+        }
+
+        images.medianBlur = function (img, size) {
+            initIfNeeded();
+            var mat = new Mat();
+            Imgproc.medianBlur(img.mat, mat, size);
+            return images.matToImage(mat);
+        }
+
+
+        images.gaussianBlur = function (img, size, sigmaX, sigmaY, type) {
+            initIfNeeded();
+            var mat = new Mat();
+            size = newSize(size);
+            sigmaX = sigmaX == undefined ? 0 : sigmaX;
+            sigmaY = sigmaY == undefined ? 0 : sigmaY;
+            type = Imgproc["BORDER_" + (type || "DEFAULT")];
+            Imgproc.GaussianBlur(img.mat, mat, size, sigmaX, sigmaY, type);
+            return images.matToImage(mat);
+        }
+
+        images.cvtColor = function (img, code, dstCn) {
+            initIfNeeded();
+            var mat = new Mat();
+            code = Imgproc["COLOR_" + code];
+            if (dstCn == undefined) {
+                Imgproc.cvtColor(img.mat, mat, code);
+            } else {
+                Imgproc.cvtColor(img.mat, mat, code, dstCn);
+            }
+            return images.matToImage(mat);
+        }
+
+        images.findCircles = function(grayImg, options) {
+            initIfNeeded();
+            options = options || {};
+            var mat = options.region == undefined ? grayImg.mat : new Mat(grayImg.mat, buildRegion(options.region, grayImg));
+            var resultMat = new Mat()
+            var dp = options.dp == undefined ? 1 : options.dp;
+            var minDst =  options.minDst == undefined ? grayImg.height / 8 : options.minDst;
+            var param1 = options.param1 == undefined ? 100 : options.param1;
+            var param2 = options.param2 == undefined ? 100 : options.param2;
+            var minRadius = options.minRadius == undefined ? 0 : options.minRadius;
+            var maxRadius = options.maxRadius == undefined ? 0 : options.maxRadius;
+            Imgproc.HoughCircles(mat, resultMat, Imgproc.CV_HOUGH_GRADIENT, dp, minDst, param1, param2, minRadius, maxRadius);
+            var result = [];
+            for (var i = 0; i < resultMat.rows(); i++) {
+                for (var j = 0; j < resultMat.cols(); j++) {
+                    var d = resultMat.get(i, j);
+                    result.push({
+                        x: d[0],
+                        y: d[1],
+                        radius: d[2]
+                    });
+                }
+            }
+            if(options.region != undefined){
+                mat.release();
+            }
+            resultMat.release();
+            return result;
+        }
+
+        images.resize = function(img, size, interpolation) {
+            initIfNeeded();
+            var mat = new Mat();
+            interpolation = Imgproc["INTER_" + (interpolation || "LINEAR")];
+            Imgproc.resize(img.mat, mat, newSize(size), 0, 0, interpolation);
+            return images.matToImage(mat);
+        }
+
+        images.scale = function(img, fx, fy, interpolation) {
+            initIfNeeded();
+            var mat = new Mat();
+            interpolation = Imgproc["INTER_" + (interpolation || "LINEAR")];
+            Imgproc.resize(img.mat, mat, newSize([0, 0]), fx, fy, interpolation);
+            return images.matToImage(mat);
+        }
+
+        images.rotate = function(img, degree, x, y) {
+            initIfNeeded();
+            if(x == undefined){
+                x = img.width / 2;
+            }
+            if(y == undefined){
+                y = img.height / 2;
+            }
+            return javaImages.rotate(img, x, y, degree);
+        }
+
+        images.concat = function(img1, img2, direction, rect1, rect2) {
+            initIfNeeded();
+            direction = direction || "right";
+            rect1 = buildRegion(rect1, img1);
+            rect2 = buildRegion(rect2, img1);
+            return javaImages.concat(img1, rect1, img2, rect2, android.view.Gravity[direction.toUpperCase()]);
+        }
+
+        images.detectsColor = function (img, color, x, y, threshold, algorithm) {
+            initIfNeeded();
+            color = parseColor(color);
+            algorithm = algorithm || "diff";
+            threshold = threshold || defaultColorThreshold;
+            var colorDetector = getColorDetector(color, algorithm, threshold);
+            var pixel = images.pixel(img, x, y);
+            return colorDetector.detectsColor(colors.red(pixel), colors.green(pixel), colors.blue(pixel));
+        }
+
+        images.findColor = function (img, color, options) {
+            initIfNeeded();
+            color = parseColor(color);
+            options = options || {};
+            var region = options.region || [];
+            if (options.similarity) {
+                var threshold = parseInt(255 * (1 - options.similarity));
+            } else {
+                var threshold = options.threshold || defaultColorThreshold;
+            }
+            if (options.region) {
+                return colorFinder.findColor(img, color, threshold, buildRegion(options.region, img));
+            } else {
+                return colorFinder.findColor(img, color, threshold, null);
+            }
+        }
+
+        images.findColorInRegion = function (img, color, x, y, width, height, threshold) {
+            return findColor(img, color, {
+                region: [x, y, width, height],
+                threshold: threshold
+            });
+        }
+
+        images.findColorEquals = function (img, color, x, y, width, height) {
+            return findColor(img, color, {
+                region: [x, y, width, height],
+                threshold: 0
+            });
+        }
+
+        images.findAllPointsForColor = function (img, color, options) {
+            initIfNeeded();
+            color = parseColor(color);
+            options = options || {};
+            if (options.similarity) {
+                var threshold = parseInt(255 * (1 - options.similarity));
+            } else {
+                var threshold = options.threshold || defaultColorThreshold;
+            }
+            if (options.region) {
+                return toPointArray(colorFinder.findAllPointsForColor(img, color, threshold, buildRegion(options.region, img)));
+            } else {
+                return toPointArray(colorFinder.findAllPointsForColor(img, color, threshold, null));
+            }
+        }
+
+        images.findMultiColors = function (img, firstColor, paths, options) {
+            initIfNeeded();
+            options = options || {};
+            firstColor = parseColor(firstColor);
+            var list = java.lang.reflect.Array.newInstance(java.lang.Integer.TYPE, paths.length * 3);
+            for (var i = 0; i < paths.length; i++) {
+                var p = paths[i];
+                list[i * 3] = p[0];
+                list[i * 3 + 1] = p[1];
+                list[i * 3 + 2] = parseColor(p[2]);
+            }
+            var region = options.region ? buildRegion(options.region, img) : null;
+            var threshold = options.threshold === undefined ? defaultColorThreshold : options.threshold;
+            return colorFinder.findMultiColors(img, firstColor, threshold, region, list);
+        }
+
+        images.findImage = function (img, template, options) {
+            initIfNeeded();
+            options = options || {};
+            var threshold = options.threshold || 0.9;
+            var maxLevel = -1;
+            if (typeof (options.level) == 'number') {
+                maxLevel = options.level;
+            }
+            var weakThreshold = options.weakThreshold || 0.7;
+            if (options.region) {
+                return javaImages.findImage(img, template, weakThreshold, threshold, buildRegion(options.region, img), maxLevel);
+            } else {
+                return javaImages.findImage(img, template, weakThreshold, threshold, null, maxLevel);
+            }
+        }
+
+        images.findImageInRegion = function (img, template, x, y, width, height, threshold) {
+            return images.findImage(img, template, {
+                region: [x, y, width, height],
+                threshold: threshold
+            });
+        }
+
+        images.fromBase64 = function (base64) {
+            return javaImages.fromBase64(base64);
+        }
+
+        images.toBase64 = function (img, format, quality) {
+            format = format || "png";
+            quality = quality == undefined ? 100 : quality;
+            return javaImages.toBase64(img, format, quality);
+        }
+
+        images.fromBytes = function (bytes) {
+            return javaImages.fromBytes(bytes);
+        }
+
+        images.toBytes = function (img, format, quality) {
+            format = format || "png";
+            quality = quality == undefined ? 100 : quality;
+            return javaImages.toBytes(img, format, quality);
+        }
+
+        images.readPixels = function (path) {
+            var img = images.read(path);
+            var bitmap = img.getBitmap();
+            var w = bitmap.getWidth();
+            var h = bitmap.getHeight();
+            var pixels = util.java.array("int", w * h);
+            bitmap.getPixels(pixels, 0, w, 0, 0, w, h);
+            img.recycle();
+            return {
+                data: pixels,
+                width: w,
+                height: h
+            };
+        }
+
+        images.matToImage = function(img){
+            initIfNeeded();
+            return Image.ofMat(img);
+        }
+
+        function getColorDetector(color, algorithm, threshold) {
+            switch (algorithm) {
+                case "rgb":
+                    return new com.stardust.autojs.core.image.ColorDetector.RGBDistanceDetector(color, threshold);
+                case "equal":
+                    return new com.stardust.autojs.core.image.ColorDetector.EqualityDetector(color);
+                case "diff":
+                    return new com.stardust.autojs.core.image.ColorDetector.DifferenceDetector(color, threshold);
+                case "rgb+":
+                    return new com.stardust.autojs.core.image.ColorDetector.WeightedRGBDistanceDetector(color, threshold);
+                case "hs":
+                    return new com.stardust.autojs.core.image.ColorDetector.HSDistanceDetector(color, threshold);
+            }
+            throw new Error("Unknown algorithm: " + algorithm);
+        }
+
+
+        function toPointArray(points) {
+            var arr = [];
+            for (var i = 0; i < points.length; i++) {
+                arr.push(points[i]);
+            }
+            return arr;
+        }
+
+        function buildRegion(region, img) {
+            if(region == undefined){
+                region = [];
+            }
+            var x = region[0] === undefined ? 0 : region[0];
+            var y = region[1] === undefined ? 0 : region[1];
+            var width = region[2] === undefined ? img.getWidth() - x : region[2];
+            var height = region[3] === undefined ? (img.getHeight() - y) : region[3];
+            var r = new org.opencv.core.Rect(x, y, width, height);
+            return r;
+        }
+
+        function parseColor(color) {
+            if (typeof (color) == 'string') {
+                color = colors.parseColor(color);
+            }
+            return color;
+        }
+    
+        function newSize(size) {
+            if (!Array.isArray(size)) {
+                size = [size, size];
+            }
+            if (size.length == 1) {
+                size = [size[0], size[0]];
+            }
+            return new Size(size[0], size[1]);
+        }
+
+        function initIfNeeded(){
+            javaImages.initOpenCvIfNeeded();
+        }
+    
+        scope.__asGlobal__(images, ['requestScreenCapture', 'captureScreen', 'findImage', 'findImageInRegion', 'findColor', 'findColorInRegion', 'findColorEquals', 'findMultiColors']);
+    
+        scope.colors = colors;
+    
         return images;
-   }
-
-   var rtImages = __runtime__.getImages();
-
-   var colorFinder = rtImages.colorFinder;
-
-   images.requestScreenCapture = rtImages.requestScreenCapture.bind(rtImages);
-
-   images.captureScreen = rtImages.captureScreen.bind(rtImages);
-
-   images.read = rtImages.read.bind(rtImages);
-
-   images.copy = rtImages.copy.bind(rtImages);
-
-   images.load = rtImages.load.bind(rtImages);
-
-   images.clip = rtImages.clip.bind(rtImages);
-
-   images.save = function(img, path, format, quality){
-      format = format || "png";
-      quality = quality == undefined ? 100 : quality;
-      return rtImages.save(img, path, format, quality);
-   }
-
-   images.saveImage = images.save;
-
-   images.pixel = rtImages.pixel;
-
-   images.detectsColor = function(img, color, x, y, threshold, algorithm){
-        color = parseColor(color);
-        algorithm =  algorithm || "diff";
-        threshold = threshold || defaultColorThreshold;
-        var colorDetector = getColorDetector(color, algorithm, threshold);
-        var pixel = images.pixel(img, x, y);
-        return colorDetector.detectsColor(colors.red(pixel), colors.green(pixel), colors.blue(pixel));
-   }
-
-   images.findColor = function(img, color, options){
-        color = parseColor(color);
-        options = options || {};
-        var region = options.region || [];
-        if(options.similarity){
-            var threshold = parseInt(255 * (1 - options.similarity));
-        }else{
-            var threshold = options.threshold || defaultColorThreshold;
-        }
-        if(options.region){
-            return colorFinder.findColor(img, color, threshold, buildRegion(options.region, img));
-        }else{
-            return colorFinder.findColor(img, color, threshold, null);
-        }
-   }
-
-   images.findColorInRegion = function(img, color, x, y, width, height, threshold){
-        return findColor(img, color, {
-            region: [x, y, width, height],
-            threshold: threshold
-        });
-   }
-
-   images.findColorEquals = function(img, color, x, y, width, height){
-       return findColor(img, color, {
-           region: [x, y, width, height],
-           threshold: 0
-       });
-   }
-
-   images.findAllPointsForColor = function(img, color, options){
-       color = parseColor(color);
-       options = options || {};
-       if(options.similarity){
-           var threshold = parseInt(255 * (1 - options.similarity));
-       }else{
-           var threshold = options.threshold || defaultColorThreshold;
-       }
-       if(options.region){
-           return toPointArray(colorFinder.findAllPointsForColor(img, color, threshold, buildRegion(options.region, img)));
-       }else{
-           return toPointArray(colorFinder.findAllPointsForColor(img, color, threshold, null));
-       }
-  }
-
-  images.findMultiColors = function(img, firstColor, paths, options){
-      options = options || {};
-      firstColor = parseColor(firstColor);
-      var list = java.lang.reflect.Array.newInstance(java.lang.Integer.TYPE, paths.length * 3);
-      for(var i = 0; i < paths.length; i++){
-          var p = paths[i];
-          list[i * 3] = p[0];
-          list[i * 3 + 1] = p[1];
-          list[i * 3 + 2] = parseColor(p[2]);
-      }
-      var region = options.region ? buildRegion(options.region, img) : null;
-      var threshold = options.threshold === undefined ? defaultColorThreshold : options.threshold;
-      return colorFinder.findMultiColors(img, firstColor, threshold, region, list);
-  }
-
-  images.findImage = function(img, template, options){
-       options = options || {};
-       var threshold = options.threshold || 0.9;
-       var maxLevel = -1;
-       if(typeof(options.level) == 'number'){
-            maxLevel = options.level;
-       }
-       var weakThreshold = options.weakThreshold || 0.7;
-       if(options.region){
-            return rtImages.findImage(img, template, weakThreshold, threshold, buildRegion(options.region, img), maxLevel);
-       }else{
-            return rtImages.findImage(img, template, weakThreshold, threshold, null, maxLevel);
-       }
-  }
-
-  images.findImageInRegion = function(img, template, x, y, width, height, threshold){
-        return images.findImage(img, template, {
-            region: [x, y, width, height],
-            threshold: threshold
-        });
-  }
-
-  images.fromBase64 = function(base64){
-        return rtImages.fromBase64(base64);
-  }
-
-  images.toBase64 = function(img, format, quality){
-        format = format || "png";
-        quality = quality == undefined ? 100 : quality;
-        return rtImages.toBase64(img, format, quality);
-  }
-
-  images.fromBytes = function(bytes){
-        return rtImages.fromBytes(bytes);
-  }
-
-  images.toBytes = function(img, format, quality){
-       format = format || "png";
-       quality = quality == undefined ? 100 : quality;
-       return rtImages.toBytes(img, format, quality);
-  }
-
-  images.readPixels = function(path){
-     var img = images.read(path);
-     var bitmap = img.getBitmap();
-     var w = bitmap.getWidth();
-     var h = bitmap.getHeight();
-     var pixels = util.java.array("int", w * h);
-     bitmap.getPixels(pixels, 0, w, 0, 0, w, h);
-     img.recycle();
-     return {
-        data: pixels,
-        width: w,
-        height: h
-     };
-  }
-
-
-   function getColorDetector(color, algorithm, threshold){
-          switch(algorithm){
-              case "rgb":
-                  return new com.stardust.autojs.core.image.ColorDetector.RGBDistanceDetector(color, threshold);
-              case "equal":
-                  return new com.stardust.autojs.core.image.ColorDetector.EqualityDetector(color);
-              case "diff":
-                  return new com.stardust.autojs.core.image.ColorDetector.DifferenceDetector(color, threshold);
-              case "rgb+":
-                  return new com.stardust.autojs.core.image.ColorDetector.WeightedRGBDistanceDetector(color, threshold);
-              case "hs":
-                  return new com.stardust.autojs.core.image.ColorDetector.HSDistanceDetector(color, threshold);
-          }
-          throw new Error("Unknown algorithm: " + algorithm);
-     }
-
-
-  function toPointArray(points){
-     var arr = [];
-     for(var i = 0; i < points.length; i++){
-        arr.push(points[i]);
-     }
-     return arr;
-  }
-
-  function buildRegion(region, img){
-     var x = region[0] === undefined ? 0 : region[0];
-     var y = region[1] === undefined ? 0 : region[1];
-     var width = region[2] === undefined ? img.getWidth() - x : region[2];
-     var height = region[3] === undefined ? (img.getHeight() - y) : region[3];
-     var r = new org.opencv.core.Rect(x, y, width, height);
-     return r;
-  }
-
-   function parseColor(color){
-     if(typeof(color) == 'string'){
-        color = colors.parseColor(color);
-     }
-      return color;
-   }
-
-   scope.__asGlobal__(images, ['requestScreenCapture', 'captureScreen', 'findImage', 'findImageInRegion', 'findColor', 'findColorInRegion', 'findColorEquals', 'findMultiColors']);
-
-   scope.colors = colors;
-
-   return images;
+    }
 }
\ No newline at end of file
diff --git a/autojs/src/main/assets/modules/__plugins__.js b/autojs/src/main/assets/modules/__plugins__.js
new file mode 100644
index 00000000..fac1aab2
--- /dev/null
+++ b/autojs/src/main/assets/modules/__plugins__.js
@@ -0,0 +1,12 @@
+module.exports = function (runtime, scope) {
+    function plugins(){
+    }
+
+    plugins.load = function(packageName){
+        var plugin = runtime.plugins.load(packageName);
+        var index = require(plugin.mainScriptPath);
+        return index(plugin.unwrap());
+    }
+
+    return plugins;
+}
\ No newline at end of file
diff --git a/autojs/src/main/assets/modules/__threads__.js b/autojs/src/main/assets/modules/__threads__.js
index 01bc05f4..93c6dba2 100644
--- a/autojs/src/main/assets/modules/__threads__.js
+++ b/autojs/src/main/assets/modules/__threads__.js
@@ -1,12 +1,26 @@
 
-module.exports = function(__runtime__, scope){
-   var threads = Object.create(__runtime__.threads);
+module.exports = function (__runtime__, scope) {
+    var threads = Object.create(__runtime__.threads);
 
 
-   scope.sync = function(func, lock){
+    scope.sync = function (func, lock) {
         lock = lock || null;
         return new org.mozilla.javascript.Synchronizer(func, lock);
-   }
+    }
 
-   return threads;
+    global.Promise.prototype.wait = function () {
+        var disposable = threads.disposable();
+        this.then(result => {
+            disposable.setAndNotify({ result: result });
+        }).catch(error => {
+            disposable.setAndNotify({ error: error });
+        });
+        var r = disposable.blockedGet();
+        if (r.error) {
+            throw r.error;
+        }
+        return r.result;
+    }
+
+    return threads;
 }
\ No newline at end of file
diff --git a/autojs/src/main/assets/modules/__ui__.js b/autojs/src/main/assets/modules/__ui__.js
index 5863283b..f9fcb9a0 100644
--- a/autojs/src/main/assets/modules/__ui__.js
+++ b/autojs/src/main/assets/modules/__ui__.js
@@ -19,6 +19,10 @@ module.exports = function (runtime, global) {
         ui.setContentView(view);
     }
 
+    ui.layoutFile = function(file) {
+        ui.layout(files.read(file));
+    }
+
     ui.inflate = function(xml, parent, attachToParent){
         if(!activity){
             throw new Error("需要在ui模式下运行才能使用该函数");
@@ -94,8 +98,11 @@ module.exports = function (runtime, global) {
     }
 
     ui.post = function (action, delay) {
-        delay = delay || 0;
-        runtime.getUiHandler().postDelayed(wrapUiAction(action), delay);
+        if(delay == undefined){
+            runtime.getUiHandler().post(wrapUiAction(action));
+        }else{
+            runtime.getUiHandler().postDelayed(wrapUiAction(action), delay);
+        }
     }
 
     ui.statusBarColor = function (color) {
diff --git a/autojs/src/main/assets/modules/__util__.js b/autojs/src/main/assets/modules/__util__.js
index 81f1e5e8..e507af41 100644
--- a/autojs/src/main/assets/modules/__util__.js
+++ b/autojs/src/main/assets/modules/__util__.js
@@ -19,7 +19,6 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-var formatRegExp = /%[sdj%]/g;
 exports.extend = (function () {
   var extendStatics = Object.setPrototypeOf ||
       ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
@@ -30,7 +29,16 @@ exports.extend = (function () {
       d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
   };
 })();
+
 exports.java = require("__java_util__");
+
+exports.__assignFunctions__ = function(src, target, functions) {
+    for(let f of functions){
+        target[f] = src[f].bind(src);
+    }
+}
+
+var formatRegExp = /%[sdj%]/g;
 exports.format = function(f) {
   if (!isString(f)) {
     var objects = [];
diff --git a/autojs/src/main/assets/modules/jvm-npm.js b/autojs/src/main/assets/modules/jvm-npm.js
index ac5701ec..84303080 100644
--- a/autojs/src/main/assets/modules/jvm-npm.js
+++ b/autojs/src/main/assets/modules/jvm-npm.js
@@ -30,7 +30,7 @@ module = (typeof module === 'undefined') ? {} : module;
     NativeRequire.require = require;
   }
 
-  function Module (id, parent, core) {
+  function Module(id, parent, core) {
     this.id = id;
     this.core = core;
     this.parent = parent;
@@ -56,33 +56,25 @@ module = (typeof module === 'undefined') ? {} : module;
     }.bind(this);
   }
 
-  Module._load = function _load (file, parent, core, main) {
-    var module = new Module(file, parent, core);
-    var body = readFile(module.filename, module.core);
-    var dir = new File(module.filename).getParent();
-    var func = new Function('exports', 'module', 'require', '__filename', '__dirname', body);
-    func.apply(module,
-      [module.exports, module, module.require, module.filename, dir]);
-    module.loaded = true;
-    module.main = main;
-    return module.exports;
+  Module._load = function _load(file, parent, core, main) {
+    return NativeRequire.require(file);
   };
 
-  Module.runMain = function runMain (main) {
+  Module.runMain = function runMain(main) {
     var file = Require.resolve(main);
     Module._load(file, undefined, false, true);
   };
 
-  function Require (id, parent) {
+  function Require(id, parent) {
     var normalizePath = normalizeName(id);
-    if(builtInModules.indexOf(normalizePath) >= 0 && !files.exists(normalizePath)){
-        return NativeRequire.require(normalizePath);
+    if (builtInModules.indexOf(normalizePath) >= 0 && !files.exists(normalizePath)) {
+      return NativeRequire.require(normalizePath);
     }
-    if(id === "events"){
-        return events;
+    if (id === "events") {
+      return events;
     }
-    if(id.startsWith("http://") || id.startsWith("https://")){
-        return NativeRequire.require(id);
+    if (id.startsWith("http://") || id.startsWith("https://")) {
+      return NativeRequire.require(id);
     }
 
     var core;
@@ -105,21 +97,12 @@ module = (typeof module === 'undefined') ? {} : module;
       file = file.path;
       core = true;
     }
-    try {
-      if (Require.cache[file]) {
-        return Require.cache[file];
-      } else if (file.endsWith('.js')) {
-        return Module._load(file, parent, core);
-      } else if (file.endsWith('.json')) {
-        return loadJSON(file);
-      }
-    } catch (ex) {
-      if (ex instanceof java.lang.Exception) {
-        throw new ModuleError('Cannot load module ' + id, 'LOAD_ERROR', ex);
-      } else {
-        System.out.println('Cannot load module ' + id + ' LOAD_ERROR');
-        throw ex;
-      }
+    if (Require.cache[file]) {
+      return Require.cache[file];
+    } else if (file.endsWith('.js')) {
+      return Module._load(file, parent, core);
+    } else if (file.endsWith('.json')) {
+      return loadJSON(file);
     }
   }
 
@@ -128,10 +111,10 @@ module = (typeof module === 'undefined') ? {} : module;
     for (var i = 0; i < roots.length; ++i) {
       var root = roots[i];
       var result = resolveCoreModule(id, root) ||
-      resolveAsFile(id, root, '.js') ||
-      resolveAsFile(id, root, '.json') ||
-      resolveAsDirectory(id, root) ||
-      resolveAsNodeModule(id, root);
+        resolveAsFile(id, root, '.js') ||
+        resolveAsFile(id, root, '.json') ||
+        resolveAsDirectory(id, root) ||
+        resolveAsNodeModule(id, root);
       if (result) {
         return result;
       }
@@ -142,13 +125,13 @@ module = (typeof module === 'undefined') ? {} : module;
   Require.root = files.cwd();//System.getProperty('user.dir');
   Require.NODE_PATH = undefined;
 
-  function findRoots (parent) {
+  function findRoots(parent) {
     var r = [];
     r.push(findRoot(parent));
     return r.concat(Require.paths());
   }
 
-  function parsePaths (paths) {
+  function parsePaths(paths) {
     if (!paths) {
       return [];
     }
@@ -184,7 +167,7 @@ module = (typeof module === 'undefined') ? {} : module;
     return r;
   };
 
-  function findRoot (parent) {
+  function findRoot(parent) {
     if (!parent || !parent.id) { return Require.root; }
     var pathParts = parent.id.split(/[\/|\\,]+/g);
     pathParts.pop();
@@ -199,20 +182,20 @@ module = (typeof module === 'undefined') ? {} : module;
   Module.require = require;
   module.exports = Module;
 
-  function loadJSON (file) {
+  function loadJSON(file) {
     var json = JSON.parse(readFile(file));
     Require.cache[file] = json;
     return json;
   }
 
-  function resolveAsNodeModule (id, root) {
+  function resolveAsNodeModule(id, root) {
     var base = [root, 'node_modules'].join('/');
     return resolveAsFile(id, base) ||
       resolveAsDirectory(id, base) ||
       (root ? resolveAsNodeModule(id, new File(root).getParent()) : false);
   }
 
-  function resolveAsDirectory (id, root) {
+  function resolveAsDirectory(id, root) {
     var base = [root, id].join('/');
     var file = new File([base, 'package.json'].join('/'));
     if (file.exists()) {
@@ -232,7 +215,7 @@ module = (typeof module === 'undefined') ? {} : module;
     return resolveAsFile('index.js', base);
   }
 
-  function resolveAsFile (id, root, ext) {
+  function resolveAsFile(id, root, ext) {
     var file;
     if (id.length > 0 && id[0] === '/') {
       file = new File(normalizeName(id, ext));
@@ -247,7 +230,7 @@ module = (typeof module === 'undefined') ? {} : module;
     }
   }
 
-  function resolveCoreModule (id, root) {
+  function resolveCoreModule(id, root) {
     var name = normalizeName(id);
     var classloader = java.lang.Thread.currentThread().getContextClassLoader();
     if (classloader.getResource(name)) {
@@ -255,9 +238,9 @@ module = (typeof module === 'undefined') ? {} : module;
     }
   }
 
-  function normalizeName (fileName, ext) {
-    if(fileName.endsWith('.json')){
-        return fileName;
+  function normalizeName(fileName, ext) {
+    if (fileName.endsWith('.json')) {
+      return fileName;
     }
     var extension = ext || '.js';
     if (fileName.endsWith(extension)) {
@@ -266,7 +249,7 @@ module = (typeof module === 'undefined') ? {} : module;
     return fileName + extension;
   }
 
-  function readFile (filename, core) {
+  function readFile(filename, core) {
     var input;
     try {
       if (core) {
@@ -282,7 +265,7 @@ module = (typeof module === 'undefined') ? {} : module;
     }
   }
 
-  function ModuleError (message, code, cause) {
+  function ModuleError(message, code, cause) {
     this.code = code || 'UNDEFINED';
     this.message = message || 'Error loading module';
     this.cause = cause;
diff --git a/autojs/src/main/assets/modules/promise.js b/autojs/src/main/assets/modules/promise.js
index 8412d601..b37c7755 100644
--- a/autojs/src/main/assets/modules/promise.js
+++ b/autojs/src/main/assets/modules/promise.js
@@ -1,215 +1 @@
-'use strict';
-
-function asap(action){
-    action();
-}
-
-function noop() {}
-
-// States:
-//
-// 0 - pending
-// 1 - fulfilled with _value
-// 2 - rejected with _value
-// 3 - adopted the state of another promise, _value
-//
-// once the state is no longer pending (0) it is immutable
-
-// All `_` prefixed properties will be reduced to `_{random number}`
-// at build time to obfuscate them and discourage their use.
-// We don't use symbols or Object.defineProperty to fully hide them
-// because the performance isn't good enough.
-
-
-// to avoid using try/catch inside critical functions, we
-// extract them to here.
-var LAST_ERROR = null;
-var IS_ERROR = {};
-function getThen(obj) {
-  try {
-    return obj.then;
-  } catch (ex) {
-    LAST_ERROR = ex;
-    return IS_ERROR;
-  }
-}
-
-function tryCallOne(fn, a) {
-  try {
-    return fn(a);
-  } catch (ex) {
-    LAST_ERROR = ex;
-    return IS_ERROR;
-  }
-}
-function tryCallTwo(fn, a, b) {
-  try {
-    fn(a, b);
-  } catch (ex) {
-    LAST_ERROR = ex;
-    return IS_ERROR;
-  }
-}
-
-module.exports = Promise;
-
-function Promise(fn) {
-  if (typeof this !== 'object') {
-    throw new TypeError('Promises must be constructed via new');
-  }
-  if (typeof fn !== 'function') {
-    throw new TypeError('Promise constructor\'s argument is not a function');
-  }
-  this._deferredState = 0;
-  this._state = 0;
-  this._value = null;
-  this._deferreds = null;
-  if (fn === noop) return;
-  doResolve(fn, this);
-}
-Promise._onHandle = null;
-Promise._onReject = null;
-Promise._noop = noop;
-
-Promise.prototype.then = function(onFulfilled, onRejected) {
-  if (this.constructor !== Promise) {
-    return safeThen(this, onFulfilled, onRejected);
-  }
-  var res = new Promise(noop);
-  handle(this, new Handler(onFulfilled, onRejected, res));
-  return res;
-};
-
-function safeThen(self, onFulfilled, onRejected) {
-  return new self.constructor(function (resolve, reject) {
-    var res = new Promise(noop);
-    res.then(resolve, reject);
-    handle(self, new Handler(onFulfilled, onRejected, res));
-  });
-}
-function handle(self, deferred) {
-  while (self._state === 3) {
-    self = self._value;
-  }
-  if (Promise._onHandle) {
-    Promise._onHandle(self);
-  }
-  if (self._state === 0) {
-    if (self._deferredState === 0) {
-      self._deferredState = 1;
-      self._deferreds = deferred;
-      return;
-    }
-    if (self._deferredState === 1) {
-      self._deferredState = 2;
-      self._deferreds = [self._deferreds, deferred];
-      return;
-    }
-    self._deferreds.push(deferred);
-    return;
-  }
-  handleResolved(self, deferred);
-}
-
-function handleResolved(self, deferred) {
-  asap(function() {
-    var cb = self._state === 1 ? deferred.onFulfilled : deferred.onRejected;
-    if (cb === null) {
-      if (self._state === 1) {
-        resolve(deferred.promise, self._value);
-      } else {
-        reject(deferred.promise, self._value);
-      }
-      return;
-    }
-    var ret = tryCallOne(cb, self._value);
-    if (ret === IS_ERROR) {
-      reject(deferred.promise, LAST_ERROR);
-    } else {
-      resolve(deferred.promise, ret);
-    }
-  });
-}
-function resolve(self, newValue) {
-  // Promise Resolution Procedure: https://github.com/promises-aplus/promises-spec#the-promise-resolution-procedure
-  if (newValue === self) {
-    return reject(
-      self,
-      new TypeError('A promise cannot be resolved with itself.')
-    );
-  }
-  if (
-    newValue &&
-    (typeof newValue === 'object' || typeof newValue === 'function')
-  ) {
-    var then = getThen(newValue);
-    if (then === IS_ERROR) {
-      return reject(self, LAST_ERROR);
-    }
-    if (
-      then === self.then &&
-      newValue instanceof Promise
-    ) {
-      self._state = 3;
-      self._value = newValue;
-      finale(self);
-      return;
-    } else if (typeof then === 'function') {
-      doResolve(then.bind(newValue), self);
-      return;
-    }
-  }
-  self._state = 1;
-  self._value = newValue;
-  finale(self);
-}
-
-function reject(self, newValue) {
-  self._state = 2;
-  self._value = newValue;
-  if (Promise._onReject) {
-    Promise._onReject(self, newValue);
-  }
-  finale(self);
-}
-function finale(self) {
-  if (self._deferredState === 1) {
-    handle(self, self._deferreds);
-    self._deferreds = null;
-  }
-  if (self._deferredState === 2) {
-    for (var i = 0; i < self._deferreds.length; i++) {
-      handle(self, self._deferreds[i]);
-    }
-    self._deferreds = null;
-  }
-}
-
-function Handler(onFulfilled, onRejected, promise){
-  this.onFulfilled = typeof onFulfilled === 'function' ? onFulfilled : null;
-  this.onRejected = typeof onRejected === 'function' ? onRejected : null;
-  this.promise = promise;
-}
-
-/**
- * Take a potentially misbehaving resolver function and make sure
- * onFulfilled and onRejected are only called once.
- *
- * Makes no guarantees about asynchrony.
- */
-function doResolve(fn, promise) {
-  var done = false;
-  var res = tryCallTwo(fn, function (value) {
-    if (done) return;
-    done = true;
-    resolve(promise, value);
-  }, function (reason) {
-    if (done) return;
-    done = true;
-    reject(promise, reason);
-  });
-  if (!done && res === IS_ERROR) {
-    done = true;
-    reject(promise, LAST_ERROR);
-  }
- }
\ No newline at end of file
+!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e():"function"==typeof define&&define.amd?define(e):t.ES6Promise=e()}(this,function(){"use strict";function t(t){var e=typeof t;return null!==t&&("object"===e||"function"===e)}function e(t){return"function"==typeof t}function n(t){B=t}function r(t){G=t}function o(){return function(){return process.nextTick(a)}}function i(){return"undefined"!=typeof z?function(){z(a)}:c()}function s(){var t=0,e=new J(a),n=document.createTextNode("");return e.observe(n,{characterData:!0}),function(){n.data=t=++t%2}}function u(){var t=new MessageChannel;return t.port1.onmessage=a,function(){return t.port2.postMessage(0)}}function c(){var t=setTimeout;return function(){return t(a,1)}}function a(){for(var t=0;t<W;t+=2){var e=V[t],n=V[t+1];e(n),V[t]=void 0,V[t+1]=void 0}W=0}function f(){try{var t=Function("return this")().require("vertx");return z=t.runOnLoop||t.runOnContext,i()}catch(e){return c()}}function l(t,e){var n=this,r=new this.constructor(p);void 0===r[Z]&&O(r);var o=n._state;if(o){var i=arguments[o-1];G(function(){return P(o,r,i,n._result)})}else E(n,r,t,e);return r}function h(t){var e=this;if(t&&"object"==typeof t&&t.constructor===e)return t;var n=new e(p);return g(n,t),n}function p(){}function v(){return new TypeError("You cannot resolve a promise with itself")}function d(){return new TypeError("A promises callback cannot return that same promise.")}function _(t){try{return t.then}catch(e){return nt.error=e,nt}}function y(t,e,n,r){try{t.call(e,n,r)}catch(o){return o}}function m(t,e,n){G(function(t){var r=!1,o=y(n,e,function(n){r||(r=!0,e!==n?g(t,n):S(t,n))},function(e){r||(r=!0,j(t,e))},"Settle: "+(t._label||" unknown promise"));!r&&o&&(r=!0,j(t,o))},t)}function b(t,e){e._state===tt?S(t,e._result):e._state===et?j(t,e._result):E(e,void 0,function(e){return g(t,e)},function(e){return j(t,e)})}function w(t,n,r){n.constructor===t.constructor&&r===l&&n.constructor.resolve===h?b(t,n):r===nt?(j(t,nt.error),nt.error=null):void 0===r?S(t,n):e(r)?m(t,n,r):S(t,n)}function g(e,n){e===n?j(e,v()):t(n)?w(e,n,_(n)):S(e,n)}function A(t){t._onerror&&t._onerror(t._result),T(t)}function S(t,e){t._state===$&&(t._result=e,t._state=tt,0!==t._subscribers.length&&G(T,t))}function j(t,e){t._state===$&&(t._state=et,t._result=e,G(A,t))}function E(t,e,n,r){var o=t._subscribers,i=o.length;t._onerror=null,o[i]=e,o[i+tt]=n,o[i+et]=r,0===i&&t._state&&G(T,t)}function T(t){var e=t._subscribers,n=t._state;if(0!==e.length){for(var r=void 0,o=void 0,i=t._result,s=0;s<e.length;s+=3)r=e[s],o=e[s+n],r?P(n,r,o,i):o(i);t._subscribers.length=0}}function M(t,e){try{return t(e)}catch(n){return nt.error=n,nt}}function P(t,n,r,o){var i=e(r),s=void 0,u=void 0,c=void 0,a=void 0;if(i){if(s=M(r,o),s===nt?(a=!0,u=s.error,s.error=null):c=!0,n===s)return void j(n,d())}else s=o,c=!0;n._state!==$||(i&&c?g(n,s):a?j(n,u):t===tt?S(n,s):t===et&&j(n,s))}function x(t,e){try{e(function(e){g(t,e)},function(e){j(t,e)})}catch(n){j(t,n)}}function C(){return rt++}function O(t){t[Z]=rt++,t._state=void 0,t._result=void 0,t._subscribers=[]}function k(){return new Error("Array Methods must be provided an Array")}function F(t){return new ot(this,t).promise}function Y(t){var e=this;return new e(U(t)?function(n,r){for(var o=t.length,i=0;i<o;i++)e.resolve(t[i]).then(n,r)}:function(t,e){return e(new TypeError("You must pass an array to race."))})}function q(t){var e=this,n=new e(p);return j(n,t),n}function D(){throw new TypeError("You must pass a resolver function as the first argument to the promise constructor")}function K(){throw new TypeError("Failed to construct 'Promise': Please use the 'new' operator, this object constructor cannot be called as a function.")}function L(){var t=void 0;if("undefined"!=typeof global)t=global;else if("undefined"!=typeof self)t=self;else try{t=Function("return this")()}catch(e){throw new Error("polyfill failed because global object is unavailable in this environment")}var n=t.Promise;if(n){var r=null;try{r=Object.prototype.toString.call(n.resolve())}catch(e){}if("[object Promise]"===r&&!n.cast)return}t.Promise=it}var N=void 0;N=Array.isArray?Array.isArray:function(t){return"[object Array]"===Object.prototype.toString.call(t)};var U=N,W=0,z=void 0,B=void 0,G=function(t,e){V[W]=t,V[W+1]=e,W+=2,2===W&&(B?B(a):X())},H="undefined"!=typeof window?window:void 0,I=H||{},J=I.MutationObserver||I.WebKitMutationObserver,Q="undefined"==typeof self&&"undefined"!=typeof process&&"[object process]"==={}.toString.call(process),R="undefined"!=typeof Uint8ClampedArray&&"undefined"!=typeof importScripts&&"undefined"!=typeof MessageChannel,V=new Array(1e3),X=void 0;X=Q?o():J?s():R?u():void 0===H&&"function"==typeof require?f():c();var Z=Math.random().toString(36).substring(2),$=void 0,tt=1,et=2,nt={error:null},rt=0,ot=function(){function t(t,e){this._instanceConstructor=t,this.promise=new t(p),this.promise[Z]||O(this.promise),U(e)?(this.length=e.length,this._remaining=e.length,this._result=new Array(this.length),0===this.length?S(this.promise,this._result):(this.length=this.length||0,this._enumerate(e),0===this._remaining&&S(this.promise,this._result))):j(this.promise,k())}return t.prototype._enumerate=function(t){for(var e=0;this._state===$&&e<t.length;e++)this._eachEntry(t[e],e)},t.prototype._eachEntry=function(t,e){var n=this._instanceConstructor,r=n.resolve;if(r===h){var o=_(t);if(o===l&&t._state!==$)this._settledAt(t._state,e,t._result);else if("function"!=typeof o)this._remaining--,this._result[e]=t;else if(n===it){var i=new n(p);w(i,t,o),this._willSettleAt(i,e)}else this._willSettleAt(new n(function(e){return e(t)}),e)}else this._willSettleAt(r(t),e)},t.prototype._settledAt=function(t,e,n){var r=this.promise;r._state===$&&(this._remaining--,t===et?j(r,n):this._result[e]=n),0===this._remaining&&S(r,this._result)},t.prototype._willSettleAt=function(t,e){var n=this;E(t,void 0,function(t){return n._settledAt(tt,e,t)},function(t){return n._settledAt(et,e,t)})},t}(),it=function(){function t(e){this[Z]=C(),this._result=this._state=void 0,this._subscribers=[],p!==e&&("function"!=typeof e&&D(),this instanceof t?x(this,e):K())}return t.prototype["catch"]=function(t){return this.then(null,t)},t.prototype["finally"]=function(t){var n=this,r=n.constructor;return e(t)?n.then(function(e){return r.resolve(t()).then(function(){return e})},function(e){return r.resolve(t()).then(function(){throw e})}):n.then(t,t)},t}();return it.prototype.then=l,it.all=F,it.race=Y,it.resolve=h,it.reject=q,it._setScheduler=n,it._setAsap=r,it._asap=G,it.polyfill=L,it.Promise=it,it});
\ No newline at end of file
diff --git a/autojs/src/main/assets/modules/result_adapter.js b/autojs/src/main/assets/modules/result_adapter.js
new file mode 100644
index 00000000..b9d2496d
--- /dev/null
+++ b/autojs/src/main/assets/modules/result_adapter.js
@@ -0,0 +1,95 @@
+function ResultAdapter() {
+    if (ui.isUiThread()) {
+        this.cont = continuation.create();
+        this.impl = {
+            setResult: (result) => {
+                this.cont.resume(result);
+            },
+            setError: (error) => {
+                this.cont.resumeError(error);
+            },
+            get: () => {
+                return this.cont.await();
+            }
+        };
+    } else {
+        this.disposable = threads.disposable();
+        this.impl = {
+            setResult: (result) => {
+                this.disposable.setAndNotify({ result: result });
+            },
+            setError: (error) => {
+                this.disposable.setAndNotify({ error: error });
+            },
+            get: () => {
+                let result = this.disposable.blockedGet();
+                return getOrThrow(result);
+            }
+        };
+    }
+}
+
+function getOrThrow(result) {
+    if (result.error) {
+        throw result.error;
+    }
+    return result.result;
+}
+
+ResultAdapter.prototype.setResult = function (result) {
+    this.impl.setResult(result);
+}
+
+ResultAdapter.prototype.setError = function (error) {
+    this.impl.setError(error);
+}
+
+ResultAdapter.prototype.callback = function () {
+    var that = this;
+    return function (result, error) {
+        if (that.result !== undefined) {
+            that.result = {
+                result: result,
+                error: error
+            };
+            return;
+        }
+        if (error) {
+            that.setError(error);
+        } else {
+            that.setResult(result);
+        }
+    };
+}
+
+ResultAdapter.prototype.get = function () {
+    if (this.result) {
+        return getOrThrow(this.result);
+    }
+    this.result = null;
+    return this.impl.get();
+}
+
+ResultAdapter.promise = function (promiseAdapter) {
+    return new Promise(function (resolve, reject) {
+        promiseAdapter.onResolve(function (result) {
+            resolve(result);
+        }).onReject(function (error) {
+            reject(error);
+        });
+    })
+}
+
+ResultAdapter.wait = function (promise) {
+    var proto = Object.getPrototypeOf(promise);
+    if (!proto || proto.constructor !== Promise) {
+        promise = ResultAdapter.promise(promise);
+    }
+    if (continuation.enabled) {
+        return promise.await();
+    } else {
+        return promise.wait();
+    }
+}
+
+module.exports = ResultAdapter;
\ No newline at end of file
diff --git a/autojs/src/main/java/com/stardust/autojs/AutoJs.java b/autojs/src/main/java/com/stardust/autojs/AutoJs.java
index 4669d431..eccbe757 100644
--- a/autojs/src/main/java/com/stardust/autojs/AutoJs.java
+++ b/autojs/src/main/java/com/stardust/autojs/AutoJs.java
@@ -5,14 +5,15 @@ import android.app.Application;
 import android.content.Context;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.annotation.RequiresApi;
+
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
 
 import com.stardust.app.OnActivityResultDelegate;
 import com.stardust.app.SimpleActivityLifecycleCallbacks;
 import com.stardust.autojs.core.accessibility.AccessibilityBridge;
-import com.stardust.autojs.core.console.GlobalStardustConsole;
-import com.stardust.autojs.core.console.StardustConsole;
+import com.stardust.autojs.core.console.GlobalConsole;
+import com.stardust.autojs.core.console.ConsoleImpl;
 import com.stardust.autojs.core.image.capture.ScreenCaptureRequestActivity;
 import com.stardust.autojs.core.image.capture.ScreenCaptureRequester;
 import com.stardust.autojs.core.record.accessibility.AccessibilityActionRecorder;
@@ -26,6 +27,7 @@ import com.stardust.autojs.runtime.accessibility.AccessibilityConfig;
 import com.stardust.autojs.runtime.api.AppUtils;
 import com.stardust.autojs.script.AutoFileSource;
 import com.stardust.autojs.script.JavaScriptSource;
+import com.stardust.util.ResourceMonitor;
 import com.stardust.util.ScreenMetrics;
 import com.stardust.util.UiHandler;
 import com.stardust.view.accessibility.AccessibilityInfoProvider;
@@ -34,7 +36,7 @@ import com.stardust.view.accessibility.AccessibilityService;
 import com.stardust.view.accessibility.LayoutInspector;
 
 import org.mozilla.javascript.ContextFactory;
-import org.mozilla.javascript.Scriptable;
+import org.mozilla.javascript.WrappedException;
 
 import java.io.File;
 
@@ -47,7 +49,7 @@ public abstract class AutoJs {
     private final AccessibilityActionRecorder mAccessibilityActionRecorder = new AccessibilityActionRecorder();
     private final AccessibilityNotificationObserver mNotificationObserver;
     private ScriptEngineManager mScriptEngineManager;
-    private final LayoutInspector mLayoutInspector = new LayoutInspector();
+    private final LayoutInspector mLayoutInspector;
     private final Context mContext;
     private final Application mApplication;
     private final UiHandler mUiHandler;
@@ -55,17 +57,18 @@ public abstract class AutoJs {
     private final AccessibilityInfoProvider mAccessibilityInfoProvider;
     private final ScreenCaptureRequester mScreenCaptureRequester = new ScreenCaptureRequesterImpl();
     private final ScriptEngineService mScriptEngineService;
-    private final GlobalStardustConsole mGlobalConsole;
+    private final GlobalConsole mGlobalConsole;
 
 
     protected AutoJs(final Application application) {
         mContext = application.getApplicationContext();
         mApplication = application;
+        mLayoutInspector = new LayoutInspector(mContext);
         mUiHandler = new UiHandler(mContext);
         mAppUtils = createAppUtils(mContext);
         mGlobalConsole = createGlobalConsole();
         mNotificationObserver = new AccessibilityNotificationObserver(mContext);
-        mAccessibilityInfoProvider = new AccessibilityInfoProvider(mContext.getPackageManager());
+        mAccessibilityInfoProvider = new AccessibilityInfoProvider(mContext);
         mScriptEngineService = buildScriptEngineService();
         ScriptEngineService.setInstance(mScriptEngineService);
         init();
@@ -75,13 +78,24 @@ public abstract class AutoJs {
         return new AppUtils(mContext);
     }
 
-    protected GlobalStardustConsole createGlobalConsole() {
-        return new GlobalStardustConsole(mUiHandler);
+    protected GlobalConsole createGlobalConsole() {
+        return new GlobalConsole(mUiHandler);
     }
 
     protected void init() {
         addAccessibilityServiceDelegates();
         registerActivityLifecycleCallbacks();
+        ResourceMonitor.setExceptionCreator(resource -> {
+            Exception exception;
+            if (org.mozilla.javascript.Context.getCurrentContext() != null) {
+                exception = new WrappedException(new ResourceMonitor.UnclosedResourceException(resource));
+            } else {
+                exception = new ResourceMonitor.UnclosedResourceException(resource);
+            }
+            exception.fillInStackTrace();
+            return exception;
+        });
+        ResourceMonitor.setUnclosedResourceDetectedHandler(detectedException -> mGlobalConsole.error(detectedException));
     }
 
     public abstract void ensureAccessibilityServiceEnabled();
@@ -90,6 +104,10 @@ public abstract class AutoJs {
         return mApplication;
     }
 
+    public ScriptEngineManager getScriptEngineManager() {
+        return mScriptEngineManager;
+    }
+
     protected ScriptEngineService buildScriptEngineService() {
         initScriptEngineManager();
         return new ScriptEngineServiceBuilder()
@@ -108,7 +126,6 @@ public abstract class AutoJs {
         });
         initContextFactory();
         mScriptEngineManager.registerEngine(AutoFileSource.ENGINE, () -> new RootAutomatorEngine(mContext));
-
     }
 
     protected void initContextFactory() {
@@ -117,7 +134,7 @@ public abstract class AutoJs {
 
     protected ScriptRuntime createRuntime() {
         return new ScriptRuntime.Builder()
-                .setConsole(new StardustConsole(mUiHandler, mGlobalConsole))
+                .setConsole(new ConsoleImpl(mUiHandler, mGlobalConsole))
                 .setScreenCaptureRequester(mScreenCaptureRequester)
                 .setAccessibilityBridge(new AccessibilityBridgeImpl(mUiHandler))
                 .setUiHandler(mUiHandler)
@@ -149,9 +166,9 @@ public abstract class AutoJs {
 
 
     private void addAccessibilityServiceDelegates() {
-        AccessibilityService.addDelegate(100, mAccessibilityInfoProvider);
-        AccessibilityService.addDelegate(200, mNotificationObserver);
-        AccessibilityService.addDelegate(300, mAccessibilityActionRecorder);
+        AccessibilityService.Companion.addDelegate(100, mAccessibilityInfoProvider);
+        AccessibilityService.Companion.addDelegate(200, mNotificationObserver);
+        AccessibilityService.Companion.addDelegate(300, mAccessibilityActionRecorder);
     }
 
     public AccessibilityActionRecorder getAccessibilityActionRecorder() {
@@ -170,7 +187,7 @@ public abstract class AutoJs {
         return mLayoutInspector;
     }
 
-    public GlobalStardustConsole getGlobalConsole() {
+    public GlobalConsole getGlobalConsole() {
         return mGlobalConsole;
     }
 
@@ -192,7 +209,7 @@ public abstract class AutoJs {
     private class AccessibilityBridgeImpl extends AccessibilityBridge {
 
         public AccessibilityBridgeImpl(UiHandler uiHandler) {
-            super(createAccessibilityConfig(), uiHandler);
+            super(mContext, createAccessibilityConfig(), uiHandler);
         }
 
         @Override
@@ -208,7 +225,7 @@ public abstract class AutoJs {
         @Nullable
         @Override
         public AccessibilityService getService() {
-            return AccessibilityService.getInstance();
+            return AccessibilityService.Companion.getInstance();
         }
 
         @Override
diff --git a/autojs/src/main/java/com/stardust/autojs/ScriptEngineService.java b/autojs/src/main/java/com/stardust/autojs/ScriptEngineService.java
index ddba7aaf..db623ff6 100644
--- a/autojs/src/main/java/com/stardust/autojs/ScriptEngineService.java
+++ b/autojs/src/main/java/com/stardust/autojs/ScriptEngineService.java
@@ -1,7 +1,7 @@
 package com.stardust.autojs;
 
 import android.content.Context;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import com.stardust.autojs.engine.JavaScriptEngine;
 import com.stardust.autojs.engine.ScriptEngine;
@@ -24,14 +24,7 @@ import com.stardust.util.UiHandler;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
-import org.mozilla.javascript.RhinoException;
-import org.mozilla.javascript.ScriptStackElement;
 
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.StringReader;
-import java.io.StringWriter;
 import java.util.Collection;
 import java.util.LinkedHashMap;
 import java.util.LinkedHashSet;
@@ -67,7 +60,7 @@ public class ScriptEngineService {
         }
 
         @Override
-        public void onException(ScriptExecution execution, Exception e) {
+        public void onException(ScriptExecution execution, Throwable e) {
             e.printStackTrace();
             onFinish(execution);
             String message = null;
@@ -80,7 +73,7 @@ public class ScriptEngineService {
             }
             if (execution.getEngine() instanceof JavaScriptEngine) {
                 JavaScriptEngine engine = (JavaScriptEngine) execution.getEngine();
-                Exception uncaughtException = engine.getUncaughtException();
+                Throwable uncaughtException = engine.getUncaughtException();
                 if (uncaughtException != null) {
                     engine.getRuntime().console.error(uncaughtException);
                     message = uncaughtException.getMessage();
@@ -167,11 +160,7 @@ public class ScriptEngineService {
         } else {
             r = new RunnableScriptExecution(mScriptEngineManager, task);
         }
-        if (task.getConfig().runInNewThread) {
-            new ThreadCompat(r).start();
-        } else {
-            r.run();
-        }
+        new ThreadCompat(r).start();
         return r;
     }
 
diff --git a/autojs/src/main/java/com/stardust/autojs/codegeneration/CodeGenerator.java b/autojs/src/main/java/com/stardust/autojs/codegeneration/CodeGenerator.java
index efbe5dfa..2b00d410 100644
--- a/autojs/src/main/java/com/stardust/autojs/codegeneration/CodeGenerator.java
+++ b/autojs/src/main/java/com/stardust/autojs/codegeneration/CodeGenerator.java
@@ -1,6 +1,6 @@
 package com.stardust.autojs.codegeneration;
 
-import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat;
+import androidx.core.view.accessibility.AccessibilityNodeInfoCompat;
 
 import com.stardust.automator.UiGlobalSelector;
 import com.stardust.automator.UiObject;
diff --git a/autojs/src/main/java/com/stardust/autojs/codegeneration/ReadOnlyUiObject.java b/autojs/src/main/java/com/stardust/autojs/codegeneration/ReadOnlyUiObject.java
index 56aac9e5..bd3b2ec5 100644
--- a/autojs/src/main/java/com/stardust/autojs/codegeneration/ReadOnlyUiObject.java
+++ b/autojs/src/main/java/com/stardust/autojs/codegeneration/ReadOnlyUiObject.java
@@ -1,9 +1,9 @@
 package com.stardust.autojs.codegeneration;
 
 import android.graphics.Rect;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.view.accessibility.AccessibilityNodeInfoCompat;
 
 import com.stardust.automator.UiObject;
 import com.stardust.view.accessibility.NodeInfo;
@@ -17,12 +17,12 @@ public class ReadOnlyUiObject extends UiObject {
     private NodeInfo mNodeInfo;
 
     public ReadOnlyUiObject(NodeInfo info) {
-        super(null, info.depth, -1);
+        super(null, info.getDepth(), -1);
         mNodeInfo = info;
     }
 
     public ReadOnlyUiObject(NodeInfo info, int indexInParent) {
-        super(null, info.depth, indexInParent);
+        super(null, info.getDepth(), indexInParent);
         mNodeInfo = info;
     }
 
@@ -35,7 +35,7 @@ public class ReadOnlyUiObject extends UiObject {
     @Nullable
     @Override
     public UiObject parent() {
-        return mNodeInfo.parent == null ? null : new ReadOnlyUiObject(mNodeInfo.parent);
+        return mNodeInfo.getParent() == null ? null : new ReadOnlyUiObject(mNodeInfo.getParent());
     }
 
     @Override
@@ -50,7 +50,7 @@ public class ReadOnlyUiObject extends UiObject {
 
     @Override
     public String className() {
-        return mNodeInfo.className;
+        return mNodeInfo.getClassName();
     }
 
     @Override
@@ -60,7 +60,7 @@ public class ReadOnlyUiObject extends UiObject {
 
     @Override
     public String packageName() {
-        return mNodeInfo.packageName;
+        return mNodeInfo.getPackageName();
     }
 
     @Override
@@ -70,12 +70,12 @@ public class ReadOnlyUiObject extends UiObject {
 
     @Override
     public String id() {
-        return mNodeInfo.id;
+        return mNodeInfo.getId();
     }
 
     @Override
     public String desc() {
-        return mNodeInfo.desc;
+        return mNodeInfo.getDesc();
     }
 
     @Override
@@ -101,13 +101,13 @@ public class ReadOnlyUiObject extends UiObject {
 
     @Override
     public int drawingOrder() {
-        return mNodeInfo.drawingOrder;
+        return mNodeInfo.getDrawingOrder();
     }
 
     @NonNull
     @Override
     public String text() {
-        return mNodeInfo.text;
+        return mNodeInfo.getText();
     }
 
     @Override
@@ -138,62 +138,62 @@ public class ReadOnlyUiObject extends UiObject {
 
     @Override
     public int depth() {
-        return mNodeInfo.depth;
+        return mNodeInfo.getDepth();
     }
 
     @Override
     public boolean checkable() {
-        return mNodeInfo.checkable;
+        return mNodeInfo.getCheckable();
     }
 
     @Override
     public boolean checked() {
-        return mNodeInfo.checked;
+        return mNodeInfo.getChecked();
     }
 
     @Override
     public boolean focusable() {
-        return mNodeInfo.focusable;
+        return mNodeInfo.getFocusable();
     }
 
     @Override
     public boolean focused() {
-        return mNodeInfo.focused;
+        return mNodeInfo.getFocused();
     }
 
     @Override
     public boolean visibleToUser() {
-        return mNodeInfo.visibleToUser;
+        return mNodeInfo.getVisibleToUser();
     }
 
     @Override
     public boolean accessibilityFocused() {
-        return mNodeInfo.accessibilityFocused;
+        return mNodeInfo.getAccessibilityFocused();
     }
 
     @Override
     public boolean selected() {
-        return mNodeInfo.selected;
+        return mNodeInfo.getSelected();
     }
 
     @Override
     public boolean clickable() {
-        return mNodeInfo.clickable;
+        return mNodeInfo.getClickable();
     }
 
     @Override
     public boolean longClickable() {
-        return mNodeInfo.longClickable;
+        return mNodeInfo.getLongClickable();
     }
 
     @Override
     public boolean enabled() {
-        return mNodeInfo.enabled;
+        return mNodeInfo.getEnabled();
     }
 
     @Override
     public boolean scrollable() {
-        return mNodeInfo.scrollable;
+        return mNodeInfo.getScrollable();
     }
 
     @Override
@@ -259,47 +259,47 @@ public class ReadOnlyUiObject extends UiObject {
 
     @Override
     public boolean isContextClickable() {
-        return mNodeInfo.contextClickable;
+        return mNodeInfo.getContextClickable();
     }
 
     @Override
     public boolean isDismissable() {
-        return mNodeInfo.dismissable;
+        return mNodeInfo.getDismissable();
     }
 
     @Override
     public boolean isEditable() {
-        return mNodeInfo.editable;
+        return mNodeInfo.getEditable();
     }
 
     @Override
     public int row() {
-        return mNodeInfo.row;
+        return mNodeInfo.getRow();
     }
 
     @Override
     public int column() {
-        return mNodeInfo.column;
+        return mNodeInfo.getColumn();
     }
 
     @Override
     public int rowSpan() {
-        return mNodeInfo.rowSpan;
+        return mNodeInfo.getRowSpan();
     }
 
     @Override
     public int columnSpan() {
-        return mNodeInfo.columnSpan;
+        return mNodeInfo.getColumnSpan();
     }
 
     @Override
     public int rowCount() {
-        return mNodeInfo.rowCount;
+        return mNodeInfo.getRowCount();
     }
 
     @Override
     public int columnCount() {
-        return mNodeInfo.columnCount;
+        return mNodeInfo.getColumnCount();
     }
 
     @Override
diff --git a/autojs/src/main/java/com/stardust/autojs/codegeneration/UiSelectorGenerator.java b/autojs/src/main/java/com/stardust/autojs/codegeneration/UiSelectorGenerator.java
index 2c85d687..cd3444b0 100644
--- a/autojs/src/main/java/com/stardust/autojs/codegeneration/UiSelectorGenerator.java
+++ b/autojs/src/main/java/com/stardust/autojs/codegeneration/UiSelectorGenerator.java
@@ -4,6 +4,8 @@ import com.stardust.automator.UiGlobalSelector;
 import com.stardust.automator.UiObject;
 import com.stardust.util.Consumer;
 
+import androidx.appcompat.widget.AppCompatEditText;
+
 import static com.stardust.autojs.codegeneration.CodeGenerator.FIND_ONE;
 import static com.stardust.autojs.codegeneration.CodeGenerator.UNTIL_FIND;
 import static com.stardust.autojs.codegeneration.CodeGenerator.WAIT_FOR;
@@ -115,9 +117,9 @@ public class UiSelectorGenerator {
 
     private boolean shouldStopGeneration(UiGlobalSelector selector) {
         if (mSearchMode == UNTIL_FIND) {
-            return !selector.findAndReturnList(mRoot).isEmpty();
+            return !selector.findAndReturnList(mRoot, 1).isEmpty();
         } else {
-            return selector.findAndReturnList(mRoot).size() == 1;
+            return selector.findAndReturnList(mRoot, 2).size() == 1;
 
         }
     }
diff --git a/autojs/src/main/java/com/stardust/autojs/core/accessibility/AccessibilityBridge.java b/autojs/src/main/java/com/stardust/autojs/core/accessibility/AccessibilityBridge.java
index 4e59b109..8adaf42f 100644
--- a/autojs/src/main/java/com/stardust/autojs/core/accessibility/AccessibilityBridge.java
+++ b/autojs/src/main/java/com/stardust/autojs/core/accessibility/AccessibilityBridge.java
@@ -1,12 +1,18 @@
 package com.stardust.autojs.core.accessibility;
 
+import android.app.AppOpsManager;
+import android.content.Context;
 import android.os.Build;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import android.view.accessibility.AccessibilityNodeInfo;
 import android.view.accessibility.AccessibilityWindowInfo;
 
+import com.stardust.app.AppOpsKt;
 import com.stardust.autojs.runtime.accessibility.AccessibilityConfig;
+import com.stardust.util.IntentUtil;
 import com.stardust.util.UiHandler;
 import com.stardust.view.accessibility.AccessibilityInfoProvider;
 import com.stardust.view.accessibility.AccessibilityNotificationObserver;
@@ -27,17 +33,20 @@ public abstract class AccessibilityBridge {
     public static final int MODE_FAST = 1;
 
     public static final int FLAG_FIND_ON_UI_THREAD = 1;
+    public static final int FLAG_USE_USAGE_STATS = 2;
 
     private int mMode = MODE_NORMAL;
     private int mFlags = 0;
     private final AccessibilityConfig mConfig;
     private WindowFilter mWindowFilter;
     private final UiHandler mUiHandler;
+    private final Context mContext;
 
-    public AccessibilityBridge(AccessibilityConfig config, UiHandler uiHandler) {
+    public AccessibilityBridge(Context context, AccessibilityConfig config, UiHandler uiHandler) {
         mConfig = config;
         mUiHandler = uiHandler;
         mConfig.seal();
+        mContext = context;
     }
 
     public abstract void ensureServiceEnabled();
@@ -80,7 +89,6 @@ public abstract class AccessibilityBridge {
         mWindowFilter = windowFilter;
     }
 
-    @NonNull
     public abstract AccessibilityInfoProvider getInfoProvider();
 
     public void setMode(int mode) {
@@ -93,6 +101,13 @@ public abstract class AccessibilityBridge {
 
     public void setFlags(int flags) {
         mFlags = flags;
+        if ((mFlags & FLAG_USE_USAGE_STATS) != 0 && Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            if (!AppOpsKt.isOpPermissionGranted(mContext, AppOpsManager.OPSTR_GET_USAGE_STATS)) {
+                IntentUtil.requestAppUsagePermission(mContext);
+                throw new SecurityException("没有\"查看使用情况\"权限");
+            }
+        }
+        getInfoProvider().setUseUsageStats((mFlags & FLAG_USE_USAGE_STATS) != 0);
     }
 
     @NonNull
diff --git a/autojs/src/main/java/com/stardust/autojs/core/accessibility/AccessibilityService.kt b/autojs/src/main/java/com/stardust/autojs/core/accessibility/AccessibilityService.kt
new file mode 100644
index 00000000..f8ecd297
--- /dev/null
+++ b/autojs/src/main/java/com/stardust/autojs/core/accessibility/AccessibilityService.kt
@@ -0,0 +1,27 @@
+package com.stardust.autojs.core.accessibility
+
+import android.accessibilityservice.AccessibilityServiceInfo
+import android.os.Build
+import com.stardust.autojs.core.pref.Pref
+import com.stardust.view.accessibility.AccessibilityService
+
+class AccessibilityService : AccessibilityService() {
+
+    override fun onServiceConnected() {
+        val serviceInfo = serviceInfo
+        if (Pref.isStableModeEnabled) {
+            serviceInfo.flags = serviceInfo.flags and AccessibilityServiceInfo.FLAG_INCLUDE_NOT_IMPORTANT_VIEWS.inv()
+        } else {
+            serviceInfo.flags = serviceInfo.flags or AccessibilityServiceInfo.FLAG_INCLUDE_NOT_IMPORTANT_VIEWS
+        }
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            if (Pref.isGestureObservingEnabled) {
+                serviceInfo.flags = serviceInfo.flags or AccessibilityServiceInfo.FLAG_REQUEST_TOUCH_EXPLORATION_MODE
+            } else {
+                serviceInfo.flags = serviceInfo.flags and AccessibilityServiceInfo.FLAG_REQUEST_TOUCH_EXPLORATION_MODE.inv()
+            }
+        }
+        setServiceInfo(serviceInfo)
+        super.onServiceConnected()
+    }
+}
\ No newline at end of file
diff --git a/autojs/src/main/java/com/stardust/autojs/core/accessibility/SimpleActionAutomator.java b/autojs/src/main/java/com/stardust/autojs/core/accessibility/SimpleActionAutomator.java
index 19cb6565..65c7c0e0 100644
--- a/autojs/src/main/java/com/stardust/autojs/core/accessibility/SimpleActionAutomator.java
+++ b/autojs/src/main/java/com/stardust/autojs/core/accessibility/SimpleActionAutomator.java
@@ -5,7 +5,7 @@ import android.accessibilityservice.GestureDescription;
 import android.graphics.Rect;
 import android.os.Build;
 import android.os.Handler;
-import android.support.annotation.RequiresApi;
+import androidx.annotation.RequiresApi;
 import android.util.Log;
 import android.view.accessibility.AccessibilityNodeInfo;
 
@@ -82,22 +82,22 @@ public class SimpleActionAutomator {
 
     @ScriptInterface
     public boolean scrollBackward(int i) {
-        return performAction(ActionFactory.createScrollAction(AccessibilityNodeInfo.ACTION_SCROLL_BACKWARD, i));
+        return performAction(ActionFactory.INSTANCE.createScrollAction(AccessibilityNodeInfo.ACTION_SCROLL_BACKWARD, i));
     }
 
     @ScriptInterface
     public boolean scrollForward(int i) {
-        return performAction(ActionFactory.createScrollAction(AccessibilityNodeInfo.ACTION_SCROLL_FORWARD, i));
+        return performAction(ActionFactory.INSTANCE.createScrollAction(AccessibilityNodeInfo.ACTION_SCROLL_FORWARD, i));
     }
 
     @ScriptInterface
     public boolean scrollMaxBackward() {
-        return performAction(ActionFactory.createScrollMaxAction(AccessibilityNodeInfo.ACTION_SCROLL_BACKWARD));
+        return performAction(ActionFactory.INSTANCE.createScrollMaxAction(AccessibilityNodeInfo.ACTION_SCROLL_BACKWARD));
     }
 
     @ScriptInterface
     public boolean scrollMaxForward() {
-        return performAction(ActionFactory.createScrollMaxAction(AccessibilityNodeInfo.ACTION_SCROLL_FORWARD));
+        return performAction(ActionFactory.INSTANCE.createScrollMaxAction(AccessibilityNodeInfo.ACTION_SCROLL_FORWARD));
     }
 
     @ScriptInterface
@@ -121,7 +121,7 @@ public class SimpleActionAutomator {
     @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
     public boolean appendText(ActionTarget target, String text) {
         ScriptRuntime.requiresApi(Build.VERSION_CODES.LOLLIPOP);
-        return performAction(target.createAction(UiObject.ACTION_APPEND_TEXT, text));
+        return performAction(target.createAction(UiObject.Companion.getACTION_APPEND_TEXT(), text));
     }
 
     @ScriptInterface
@@ -257,7 +257,7 @@ public class SimpleActionAutomator {
         if (root == null)
             return false;
         Log.v(TAG, "performAction: " + simpleAction + " root = " + root);
-        return simpleAction.perform(UiObject.createRoot(root));
+        return simpleAction.perform(UiObject.Companion.createRoot(root));
     }
 
     private boolean isRunningPackageSelf() {
diff --git a/autojs/src/main/java/com/stardust/autojs/core/accessibility/UiSelector.java b/autojs/src/main/java/com/stardust/autojs/core/accessibility/UiSelector.java
index c48192f1..9f014ffc 100644
--- a/autojs/src/main/java/com/stardust/autojs/core/accessibility/UiSelector.java
+++ b/autojs/src/main/java/com/stardust/autojs/core/accessibility/UiSelector.java
@@ -2,7 +2,9 @@ package com.stardust.autojs.core.accessibility;
 
 import android.os.Looper;
 import android.os.SystemClock;
-import android.support.annotation.NonNull;
+
+import androidx.annotation.NonNull;
+
 import android.util.Log;
 import android.view.accessibility.AccessibilityNodeInfo;
 
@@ -13,41 +15,43 @@ import com.stardust.automator.ActionArgument;
 import com.stardust.automator.UiGlobalSelector;
 import com.stardust.automator.UiObject;
 import com.stardust.automator.UiObjectCollection;
-import com.stardust.automator.filter.DfsFilter;
+import com.stardust.automator.filter.Filter;
 import com.stardust.concurrent.VolatileBox;
 import com.stardust.view.accessibility.AccessibilityNodeInfoAllocator;
 
-import static android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.ACTION_ACCESSIBILITY_FOCUS;
-import static android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.ACTION_ARGUMENT_COLUMN_INT;
-import static android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.ACTION_ARGUMENT_PROGRESS_VALUE;
-import static android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.ACTION_ARGUMENT_ROW_INT;
-import static android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.ACTION_ARGUMENT_SELECTION_END_INT;
-import static android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.ACTION_ARGUMENT_SELECTION_START_INT;
-import static android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.ACTION_ARGUMENT_SET_TEXT_CHARSEQUENCE;
-import static android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.ACTION_CLEAR_ACCESSIBILITY_FOCUS;
-import static android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.ACTION_CLEAR_FOCUS;
-import static android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.ACTION_CLICK;
-import static android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.ACTION_COLLAPSE;
-import static android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.ACTION_COPY;
-import static android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.ACTION_CUT;
-import static android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.ACTION_DISMISS;
-import static android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.ACTION_EXPAND;
-import static android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.ACTION_FOCUS;
-import static android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.ACTION_LONG_CLICK;
-import static android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.ACTION_PASTE;
-import static android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.ACTION_SCROLL_BACKWARD;
-import static android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.ACTION_SCROLL_FORWARD;
-import static android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.ACTION_SELECT;
-import static android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.ACTION_SET_SELECTION;
-import static android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.ACTION_SET_TEXT;
-import static android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_CONTEXT_CLICK;
-import static android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_SCROLL_DOWN;
-import static android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_SCROLL_LEFT;
-import static android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_SCROLL_RIGHT;
-import static android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_SCROLL_TO_POSITION;
-import static android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_SCROLL_UP;
-import static android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_SET_PROGRESS;
-import static android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_SHOW_ON_SCREEN;
+import org.jetbrains.annotations.NotNull;
+
+import static androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_ACCESSIBILITY_FOCUS;
+import static androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_ARGUMENT_COLUMN_INT;
+import static androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_ARGUMENT_PROGRESS_VALUE;
+import static androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_ARGUMENT_ROW_INT;
+import static androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_ARGUMENT_SELECTION_END_INT;
+import static androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_ARGUMENT_SELECTION_START_INT;
+import static androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_ARGUMENT_SET_TEXT_CHARSEQUENCE;
+import static androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_CLEAR_ACCESSIBILITY_FOCUS;
+import static androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_CLEAR_FOCUS;
+import static androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_CLICK;
+import static androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_COLLAPSE;
+import static androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_COPY;
+import static androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_CUT;
+import static androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_DISMISS;
+import static androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_EXPAND;
+import static androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_FOCUS;
+import static androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_LONG_CLICK;
+import static androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_PASTE;
+import static androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_SCROLL_BACKWARD;
+import static androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_SCROLL_FORWARD;
+import static androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_SELECT;
+import static androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_SET_SELECTION;
+import static androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_SET_TEXT;
+import static androidx.core.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_CONTEXT_CLICK;
+import static androidx.core.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_SCROLL_DOWN;
+import static androidx.core.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_SCROLL_LEFT;
+import static androidx.core.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_SCROLL_RIGHT;
+import static androidx.core.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_SCROLL_TO_POSITION;
+import static androidx.core.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_SCROLL_UP;
+import static androidx.core.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_SET_PROGRESS;
+import static androidx.core.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_SHOW_ON_SCREEN;
 
 /**
  * Created by Stardust on 2017/3/9.
@@ -70,37 +74,41 @@ public class UiSelector extends UiGlobalSelector {
         mAllocator = allocator;
     }
 
-    @NonNull
-    @ScriptInterface
-    public UiObjectCollection find() {
+    protected UiObjectCollection find(int max) {
         ensureAccessibilityServiceEnabled();
-        if((mAccessibilityBridge.getFlags() & AccessibilityBridge.FLAG_FIND_ON_UI_THREAD)!=0
-            && Looper.myLooper() != Looper.getMainLooper()){
+        if ((mAccessibilityBridge.getFlags() & AccessibilityBridge.FLAG_FIND_ON_UI_THREAD) != 0
+                && Looper.myLooper() != Looper.getMainLooper()) {
             VolatileBox<UiObjectCollection> result = new VolatileBox<>();
-            mAccessibilityBridge.post(() -> result.setAndNotify(findImpl()));
+            mAccessibilityBridge.post(() -> result.setAndNotify(findImpl(max)));
             return result.blockedGet();
         }
-        return findImpl();
+        return findImpl(max);
     }
 
     @NonNull
     @ScriptInterface
-    protected UiObjectCollection findImpl() {
+    public UiObjectCollection find() {
+        return find(Integer.MAX_VALUE);
+    }
+
+    @NonNull
+    @ScriptInterface
+    protected UiObjectCollection findImpl(int max) {
         AccessibilityNodeInfo root = mAccessibilityBridge.getRootInCurrentWindow();
         if (BuildConfig.DEBUG)
             Log.d(TAG, "find: root = " + root);
         if (root == null) {
-            return UiObjectCollection.EMPTY;
+            return UiObjectCollection.Companion.getEMPTY();
         }
         if (root.getPackageName() != null && mAccessibilityBridge.getConfig().whiteListContains(root.getPackageName().toString())) {
             Log.d(TAG, "package in white list, return null");
-            return UiObjectCollection.EMPTY;
+            return UiObjectCollection.Companion.getEMPTY();
         }
-        return findOf(UiObject.createRoot(root, mAllocator));
+        return findOf(UiObject.Companion.createRoot(root, mAllocator), max);
     }
 
     @Override
-    public UiGlobalSelector textMatches(String regex) {
+    public UiGlobalSelector textMatches(@NotNull String regex) {
         return super.textMatches(convertRegex(regex));
     }
 
@@ -114,22 +122,22 @@ public class UiSelector extends UiGlobalSelector {
 
 
     @Override
-    public UiGlobalSelector classNameMatches(String regex) {
+    public UiGlobalSelector classNameMatches(@NotNull String regex) {
         return super.classNameMatches(convertRegex(regex));
     }
 
     @Override
-    public UiGlobalSelector idMatches(String regex) {
+    public UiGlobalSelector idMatches(@NotNull String regex) {
         return super.idMatches(convertRegex(regex));
     }
 
     @Override
-    public UiGlobalSelector packageNameMatches(String regex) {
+    public UiGlobalSelector packageNameMatches(@NotNull String regex) {
         return super.packageNameMatches(convertRegex(regex));
     }
 
     @Override
-    public UiGlobalSelector descMatches(String regex) {
+    public UiGlobalSelector descMatches(@NotNull String regex) {
         return super.descMatches(convertRegex(regex));
     }
 
@@ -140,6 +148,7 @@ public class UiSelector extends UiGlobalSelector {
     @ScriptInterface
     @NonNull
     public UiObjectCollection untilFind() {
+        ensureNonUiThread();
         UiObjectCollection uiObjectCollection = find();
         while (uiObjectCollection.empty()) {
             if (Thread.currentThread().isInterrupted()) {
@@ -155,18 +164,22 @@ public class UiSelector extends UiGlobalSelector {
         return uiObjectCollection;
     }
 
+    private void ensureNonUiThread() {
+        if (Looper.myLooper() == Looper.getMainLooper()) {
+            // TODO: 2018/11/1 配置字符串
+            throw new IllegalThreadStateException("不能在ui线程执行阻塞操作, 请在子线程或子脚本执行findOne()或untilFind()");
+        }
+    }
+
     @ScriptInterface
     public UiObject findOne(long timeout) {
-        if (timeout == -1) {
-            return untilFindOne();
-        }
-        UiObjectCollection uiObjectCollection = find();
+        UiObjectCollection uiObjectCollection = find(1);
         long start = SystemClock.uptimeMillis();
         while (uiObjectCollection.empty()) {
             if (Thread.currentThread().isInterrupted()) {
                 throw new ScriptInterruptedException();
             }
-            if (SystemClock.uptimeMillis() - start > timeout) {
+            if (timeout > 0 && SystemClock.uptimeMillis() - start > timeout) {
                 return null;
             }
             try {
@@ -174,7 +187,7 @@ public class UiSelector extends UiGlobalSelector {
             } catch (InterruptedException e) {
                 throw new ScriptInterruptedException();
             }
-            uiObjectCollection = find();
+            uiObjectCollection = find(1);
         }
         return uiObjectCollection.get(0);
     }
@@ -184,7 +197,7 @@ public class UiSelector extends UiGlobalSelector {
     }
 
     public UiObject findOnce(int index) {
-        UiObjectCollection uiObjectCollection = find();
+        UiObjectCollection uiObjectCollection = find(index + 1);
         if (index >= uiObjectCollection.size()) {
             return null;
         }
@@ -204,8 +217,7 @@ public class UiSelector extends UiGlobalSelector {
 
     @NonNull
     public UiObject untilFindOne() {
-        UiObjectCollection collection = untilFind();
-        return collection.get(0);
+        return findOne(-1);
     }
 
     @ScriptInterface
@@ -214,13 +226,13 @@ public class UiSelector extends UiGlobalSelector {
     }
 
     @ScriptInterface
-    public UiSelector id(final String id) {
+    public UiSelector id(@NotNull final String id) {
         if (!id.contains(":")) {
-            addFilter(new DfsFilter() {
+            addFilter(new Filter() {
                 @Override
-                protected boolean isIncluded(UiObject nodeInfo) {
+                public boolean filter(@NotNull UiObject node) {
                     String fullId = mAccessibilityBridge.getInfoProvider().getLatestPackage() + ":id/" + id;
-                    return fullId.equals(nodeInfo.getViewIdResourceName());
+                    return fullId.equals(node.getViewIdResourceName());
                 }
 
                 @Override
@@ -235,11 +247,11 @@ public class UiSelector extends UiGlobalSelector {
     }
 
     @Override
-    public UiGlobalSelector idStartsWith(String prefix) {
+    public UiGlobalSelector idStartsWith(@NotNull String prefix) {
         if (!prefix.contains(":")) {
-            addFilter(new DfsFilter() {
+            addFilter(new Filter() {
                 @Override
-                protected boolean isIncluded(UiObject nodeInfo) {
+                public boolean filter(@NotNull UiObject nodeInfo) {
                     String fullIdPrefix = mAccessibilityBridge.getInfoProvider().getLatestPackage() + ":id/" + prefix;
                     String id = nodeInfo.getViewIdResourceName();
                     return id != null && id.startsWith(fullIdPrefix);
diff --git a/autojs/src/main/java/com/stardust/autojs/core/console/ConsoleFloaty.java b/autojs/src/main/java/com/stardust/autojs/core/console/ConsoleFloaty.java
index a6a91a51..9460619d 100644
--- a/autojs/src/main/java/com/stardust/autojs/core/console/ConsoleFloaty.java
+++ b/autojs/src/main/java/com/stardust/autojs/core/console/ConsoleFloaty.java
@@ -2,9 +2,8 @@ package com.stardust.autojs.core.console;
 
 import android.content.Context;
 import android.content.ContextWrapper;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.view.ContextThemeWrapper;
-import android.view.MotionEvent;
 import android.view.View;
 import android.view.WindowManager;
 import android.widget.TextView;
@@ -25,11 +24,11 @@ public class ConsoleFloaty extends ResizableExpandableFloaty.AbstractResizableEx
     private ContextWrapper mContextWrapper;
     private View mResizer, mMoveCursor;
     private TextView mTitleView;
-    private StardustConsole mConsole;
+    private ConsoleImpl mConsole;
     private CharSequence mTitle;
     private View mExpandedView;
 
-    public ConsoleFloaty(StardustConsole console) {
+    public ConsoleFloaty(ConsoleImpl console) {
         mConsole = console;
         setShouldRequestFocusWhenExpand(false);
         setInitialX(100);
diff --git a/autojs/src/main/java/com/stardust/autojs/core/console/StardustConsole.java b/autojs/src/main/java/com/stardust/autojs/core/console/ConsoleImpl.java
similarity index 85%
rename from autojs/src/main/java/com/stardust/autojs/core/console/StardustConsole.java
rename to autojs/src/main/java/com/stardust/autojs/core/console/ConsoleImpl.java
index 58a9dc63..65537a69 100644
--- a/autojs/src/main/java/com/stardust/autojs/core/console/StardustConsole.java
+++ b/autojs/src/main/java/com/stardust/autojs/core/console/ConsoleImpl.java
@@ -2,9 +2,8 @@ package com.stardust.autojs.core.console;
 
 import android.content.Context;
 import android.content.Intent;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.util.Log;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.view.WindowManager;
 
 import com.stardust.autojs.R;
@@ -14,42 +13,37 @@ import com.stardust.autojs.runtime.api.AbstractConsole;
 import com.stardust.autojs.runtime.api.Console;
 import com.stardust.autojs.runtime.exception.ScriptInterruptedException;
 import com.stardust.autojs.util.FloatingPermission;
-import com.stardust.concurrent.ConcurrentArrayList;
 import com.stardust.enhancedfloaty.FloatyService;
 import com.stardust.enhancedfloaty.ResizableExpandableFloatyWindow;
 import com.stardust.util.UiHandler;
 import com.stardust.util.ViewUtil;
 
-import java.io.PrintWriter;
-import java.io.StringWriter;
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
 import java.util.concurrent.ArrayBlockingQueue;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import ezy.assist.compat.SettingsCompat;
-
 /**
  * Created by Stardust on 2017/5/2.
  */
 
-public class StardustConsole extends AbstractConsole {
+public class ConsoleImpl extends AbstractConsole {
 
-    public static class Log implements Comparable<Log> {
+    public static class LogEntry implements Comparable<LogEntry> {
 
         public int id;
         public int level;
         public CharSequence content;
         public boolean newLine = false;
 
-        public Log(int id, int level, CharSequence content) {
+        public LogEntry(int id, int level, CharSequence content) {
             this.id = id;
             this.level = level;
             this.content = content;
         }
 
-        public Log(int id, int level, CharSequence content, boolean newLine) {
+        public LogEntry(int id, int level, CharSequence content, boolean newLine) {
             this.id = id;
             this.level = level;
             this.content = content;
@@ -57,20 +51,20 @@ public class StardustConsole extends AbstractConsole {
         }
 
         @Override
-        public int compareTo(@NonNull Log o) {
+        public int compareTo(@NonNull LogEntry o) {
             return 0;
         }
     }
 
     public interface LogListener {
-        void onNewLog(Log log);
+        void onNewLog(LogEntry logEntry);
 
         void onLogClear();
     }
 
     private final Object WINDOW_SHOW_LOCK = new Object();
     private final Console mGlobalConsole;
-    private final ArrayList<Log> mLogs = new ArrayList<>();
+    private final ArrayList<LogEntry> mLogEntries = new ArrayList<>();
     private AtomicInteger mIdCounter = new AtomicInteger(0);
     private ResizableExpandableFloatyWindow mFloatyWindow;
     private ConsoleFloaty mConsoleFloaty;
@@ -81,11 +75,11 @@ public class StardustConsole extends AbstractConsole {
     private volatile boolean mShown = false;
     private int mX, mY;
 
-    public StardustConsole(UiHandler uiHandler) {
+    public ConsoleImpl(UiHandler uiHandler) {
         this(uiHandler, null);
     }
 
-    public StardustConsole(UiHandler uiHandler, Console globalConsole) {
+    public ConsoleImpl(UiHandler uiHandler, Console globalConsole) {
         mUiHandler = uiHandler;
         mConsoleFloaty = new ConsoleFloaty(this);
         mGlobalConsole = globalConsole;
@@ -116,8 +110,8 @@ public class StardustConsole extends AbstractConsole {
         mLogListener = new WeakReference<>(logListener);
     }
 
-    public ArrayList<Log> getAllLogs() {
-        return mLogs;
+    public ArrayList<LogEntry> getAllLogs() {
+        return mLogEntries;
     }
 
     public void printAllStackTrace(Throwable t) {
@@ -130,15 +124,15 @@ public class StardustConsole extends AbstractConsole {
 
     @Override
     public String println(int level, CharSequence charSequence) {
-        Log log = new Log(mIdCounter.getAndIncrement(), level, charSequence, true);
-        synchronized (mLogs) {
-            mLogs.add(log);
+        LogEntry logEntry = new LogEntry(mIdCounter.getAndIncrement(), level, charSequence, true);
+        synchronized (mLogEntries) {
+            mLogEntries.add(logEntry);
         }
         if (mGlobalConsole != null) {
             mGlobalConsole.println(level, charSequence);
         }
         if (mLogListener != null && mLogListener.get() != null) {
-            mLogListener.get().onNewLog(log);
+            mLogListener.get().onNewLog(logEntry);
         }
         return null;
     }
@@ -152,8 +146,8 @@ public class StardustConsole extends AbstractConsole {
 
     @Override
     public void clear() {
-        synchronized (mLogs) {
-            mLogs.clear();
+        synchronized (mLogEntries) {
+            mLogEntries.clear();
         }
         if (mLogListener != null && mLogListener.get() != null) {
             mLogListener.get().onLogClear();
@@ -213,6 +207,7 @@ public class StardustConsole extends AbstractConsole {
         });
     }
 
+
     public void setSize(int w, int h) {
         if (mShown) {
             mUiHandler.post(() -> {
@@ -282,13 +277,22 @@ public class StardustConsole extends AbstractConsole {
         }
         if (options != null && options.length > 0) {
             StringBuilder sb = new StringBuilder(data == null ? "" : data.toString());
+            ArrayList<Object> newOptions = new ArrayList<>();
             for (Object option : options) {
                 if (option instanceof Throwable) {
                     sb.append(getStackTrace((Throwable) option)).append(" ");
+                } else {
+                    newOptions.add(option);
                 }
             }
             data = sb.toString();
+            if (newOptions.isEmpty()) {
+                super.error(data, newOptions.toArray());
+            } else {
+                super.error(data);
+            }
+        } else {
+            super.error(data, options);
         }
-        super.error(data, options);
     }
 }
diff --git a/autojs/src/main/java/com/stardust/autojs/core/console/ConsoleView.java b/autojs/src/main/java/com/stardust/autojs/core/console/ConsoleView.java
index e5081812..f4c9bb90 100644
--- a/autojs/src/main/java/com/stardust/autojs/core/console/ConsoleView.java
+++ b/autojs/src/main/java/com/stardust/autojs/core/console/ConsoleView.java
@@ -1,9 +1,11 @@
 package com.stardust.autojs.core.console;
 
 import android.content.Context;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import android.content.res.TypedArray;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
 import android.util.AttributeSet;
 import android.util.Log;
 import android.util.SparseArray;
@@ -16,19 +18,29 @@ import android.widget.FrameLayout;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import com.stardust.autojs.R;
-import com.stardust.concurrent.ConcurrentArrayList;
 import com.stardust.enhancedfloaty.ResizableExpandableFloatyWindow;
+import com.stardust.autojs.R;
+import com.stardust.util.MapBuilder;
 import com.stardust.util.SparseArrayEntries;
 
 import java.util.ArrayList;
+import java.util.Map;
 
 /**
  * Created by Stardust on 2017/5/2.
  * <p>
  * TODO: 优化为无锁形式
  */
-public class ConsoleView extends FrameLayout implements StardustConsole.LogListener {
+public class ConsoleView extends FrameLayout implements ConsoleImpl.LogListener {
+
+    private static final Map<Integer, Integer> ATTRS = new MapBuilder<Integer, Integer>()
+            .put(R.styleable.ConsoleView_color_verbose, Log.VERBOSE)
+            .put(R.styleable.ConsoleView_color_debug, Log.DEBUG)
+            .put(R.styleable.ConsoleView_color_info, Log.INFO)
+            .put(R.styleable.ConsoleView_color_warn, Log.WARN)
+            .put(R.styleable.ConsoleView_color_error, Log.ERROR)
+            .put(R.styleable.ConsoleView_color_assert, Log.ASSERT)
+            .build();
 
     static final SparseArray<Integer> COLORS = new SparseArrayEntries<Integer>()
             .entry(Log.VERBOSE, 0xdfc0c0c0)
@@ -40,37 +52,45 @@ public class ConsoleView extends FrameLayout implements StardustConsole.LogListe
             .sparseArray();
 
     private static final int REFRESH_INTERVAL = 100;
-    private SparseArray<Integer> mColors = COLORS;
-    private StardustConsole mConsole;
+    private SparseArray<Integer> mColors = COLORS.clone();
+    private ConsoleImpl mConsole;
     private RecyclerView mLogListRecyclerView;
     private EditText mEditText;
     private ResizableExpandableFloatyWindow mWindow;
     private LinearLayout mInputContainer;
     private boolean mShouldStopRefresh = false;
-    private ArrayList<StardustConsole.Log> mLogs = new ArrayList<>();
+    private ArrayList<ConsoleImpl.LogEntry> mLogEntries = new ArrayList<>();
 
     public ConsoleView(Context context) {
         super(context);
-        init();
+        init(null);
     }
 
     public ConsoleView(Context context, @Nullable AttributeSet attrs) {
         super(context, attrs);
-        init();
+        init(attrs);
     }
 
     public ConsoleView(Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
         super(context, attrs, defStyleAttr);
-        init();
+        init(attrs);
     }
 
     public void setColors(SparseArray<Integer> colors) {
         mColors = colors;
     }
 
-    private void init() {
+    private void init(AttributeSet attrs) {
         inflate(getContext(), R.layout.console_view, this);
-        mLogListRecyclerView = (RecyclerView) findViewById(R.id.log_list);
+        if (attrs != null) {
+            TypedArray typedArray = getContext().obtainStyledAttributes(attrs, R.styleable.ConsoleView);
+            for (Map.Entry<Integer, Integer> attr : ATTRS.entrySet()) {
+                int styleable = attr.getKey();
+                int logLevel = attr.getValue();
+                mColors.put(logLevel, typedArray.getColor(styleable, mColors.get(logLevel)));
+            }
+        }
+        mLogListRecyclerView = findViewById(R.id.log_list);
         LinearLayoutManager manager = new LinearLayoutManager(getContext());
         mLogListRecyclerView.setLayoutManager(manager);
         mLogListRecyclerView.setAdapter(new Adapter());
@@ -79,7 +99,7 @@ public class ConsoleView extends FrameLayout implements StardustConsole.LogListe
     }
 
     private void initSubmitButton() {
-        final Button submit = (Button) findViewById(R.id.submit);
+        final Button submit = findViewById(R.id.submit);
         submit.setOnClickListener(v -> {
             CharSequence input = mEditText.getText();
             submitInput(input);
@@ -96,9 +116,9 @@ public class ConsoleView extends FrameLayout implements StardustConsole.LogListe
     }
 
     private void initEditText() {
-        mEditText = (EditText) findViewById(R.id.input);
+        mEditText = findViewById(R.id.input);
         mEditText.setFocusableInTouchMode(true);
-        mInputContainer = (LinearLayout) findViewById(R.id.input_container);
+        mInputContainer = findViewById(R.id.input_container);
         OnClickListener listener = v -> {
             if (mWindow != null) {
                 mWindow.requestWindowFocus();
@@ -109,13 +129,13 @@ public class ConsoleView extends FrameLayout implements StardustConsole.LogListe
         mInputContainer.setOnClickListener(listener);
     }
 
-    public void setConsole(StardustConsole console) {
+    public void setConsole(ConsoleImpl console) {
         mConsole = console;
         mConsole.setConsoleView(this);
     }
 
     @Override
-    public void onNewLog(StardustConsole.Log log) {
+    public void onNewLog(ConsoleImpl.LogEntry logEntry) {
 
     }
 
@@ -144,7 +164,7 @@ public class ConsoleView extends FrameLayout implements StardustConsole.LogListe
     @Override
     public void onLogClear() {
         post(() -> {
-            mLogs.clear();
+            mLogEntries.clear();
             mLogListRecyclerView.getAdapter().notifyDataSetChanged();
         });
     }
@@ -152,10 +172,10 @@ public class ConsoleView extends FrameLayout implements StardustConsole.LogListe
     private void refreshLog() {
         if (mConsole == null)
             return;
-        int oldSize = mLogs.size();
-        ArrayList<StardustConsole.Log> logs = mConsole.getAllLogs();
+        int oldSize = mLogEntries.size();
+        ArrayList<ConsoleImpl.LogEntry> logEntries = mConsole.getAllLogs();
         synchronized (mConsole.getAllLogs()) {
-            final int size = logs.size();
+            final int size = logEntries.size();
             if (size == 0) {
                 return;
             }
@@ -163,10 +183,10 @@ public class ConsoleView extends FrameLayout implements StardustConsole.LogListe
                 return;
             }
             if (oldSize == 0) {
-                mLogs.addAll(logs);
+                mLogEntries.addAll(logEntries);
             } else {
                 for (int i = oldSize; i < size; i++) {
-                    mLogs.add(logs.get(i));
+                    mLogEntries.add(logEntries.get(i));
                 }
             }
             mLogListRecyclerView.getAdapter().notifyItemRangeInserted(oldSize, size - 1);
@@ -205,14 +225,14 @@ public class ConsoleView extends FrameLayout implements StardustConsole.LogListe
 
         @Override
         public void onBindViewHolder(ViewHolder holder, int position) {
-            StardustConsole.Log log = mLogs.get(position);
-            holder.textView.setText(log.content);
-            holder.textView.setTextColor(mColors.get(log.level));
+            ConsoleImpl.LogEntry logEntry = mLogEntries.get(position);
+            holder.textView.setText(logEntry.content);
+            holder.textView.setTextColor(mColors.get(logEntry.level));
         }
 
         @Override
         public int getItemCount() {
-            return mLogs.size();
+            return mLogEntries.size();
         }
     }
 }
diff --git a/autojs/src/main/java/com/stardust/autojs/core/console/GlobalStardustConsole.java b/autojs/src/main/java/com/stardust/autojs/core/console/GlobalConsole.java
similarity index 53%
rename from autojs/src/main/java/com/stardust/autojs/core/console/GlobalStardustConsole.java
rename to autojs/src/main/java/com/stardust/autojs/core/console/GlobalConsole.java
index 3f49b442..77edbf6f 100644
--- a/autojs/src/main/java/com/stardust/autojs/core/console/GlobalStardustConsole.java
+++ b/autojs/src/main/java/com/stardust/autojs/core/console/GlobalConsole.java
@@ -1,42 +1,57 @@
 package com.stardust.autojs.core.console;
 
-import android.util.SparseArray;
-
 import com.stardust.util.UiHandler;
 
+import org.apache.log4j.Level;
+import org.apache.log4j.Logger;
+import org.apache.log4j.Priority;
+
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Locale;
 
+
 /**
  * Created by Stardust on 2017/10/22.
  */
 
-public class GlobalStardustConsole extends StardustConsole {
+public class GlobalConsole extends ConsoleImpl {
+    private static final String LOG_tAG = "GlobalConsole";
     private static final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("HH:mm:ss.SSS", Locale.getDefault());
+    private static final Logger LOGGER = Logger.getLogger(GlobalConsole.class);
 
-    private final SparseArray<Integer> mColors;
-
-    public GlobalStardustConsole(UiHandler uiHandler) {
+    public GlobalConsole(UiHandler uiHandler) {
         super(uiHandler);
-        mColors = ConsoleView.COLORS.clone();
-        mColors.put(android.util.Log.DEBUG, 0xcc000000);
-    }
-
-    @Override
-    public void setConsoleView(ConsoleView consoleView) {
-        super.setConsoleView(consoleView);
-        consoleView.setColors(mColors);
     }
 
     @Override
     public String println(int level, CharSequence charSequence) {
         String log = String.format(Locale.getDefault(), "%s/%s: %s",
                 DATE_FORMAT.format(new Date()), getLevelChar(level), charSequence.toString());
+        LOGGER.log(toLog4jLevel(level), log);
+        android.util.Log.d(LOG_tAG, log);
         super.println(level, log);
         return log;
     }
 
+    private Priority toLog4jLevel(int level) {
+        switch (level) {
+            case android.util.Log.VERBOSE:
+                return Level.DEBUG;
+            case android.util.Log.DEBUG:
+                return Level.DEBUG;
+            case android.util.Log.INFO:
+                return Level.INFO;
+            case android.util.Log.WARN:
+                return Level.WARN;
+            case android.util.Log.ERROR:
+                return Level.ERROR;
+            case android.util.Log.ASSERT:
+                return Level.FATAL;
+        }
+        throw new IllegalArgumentException("invalid level = " + level);
+    }
+
     private String getLevelChar(int level) {
         switch (level) {
             case android.util.Log.VERBOSE:
diff --git a/autojs/src/main/java/com/stardust/autojs/core/console/NoOpConsole.java b/autojs/src/main/java/com/stardust/autojs/core/console/NoOpConsole.java
index bab2b15c..4b23a60f 100644
--- a/autojs/src/main/java/com/stardust/autojs/core/console/NoOpConsole.java
+++ b/autojs/src/main/java/com/stardust/autojs/core/console/NoOpConsole.java
@@ -1,6 +1,6 @@
 package com.stardust.autojs.core.console;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import com.stardust.autojs.runtime.api.Console;
 
diff --git a/autojs/src/main/java/com/stardust/autojs/core/eventloop/EventEmitter.java b/autojs/src/main/java/com/stardust/autojs/core/eventloop/EventEmitter.java
index e1c5d7f7..e9841608 100644
--- a/autojs/src/main/java/com/stardust/autojs/core/eventloop/EventEmitter.java
+++ b/autojs/src/main/java/com/stardust/autojs/core/eventloop/EventEmitter.java
@@ -1,9 +1,6 @@
 package com.stardust.autojs.core.eventloop;
 
-import android.support.annotation.NonNull;
-import android.view.View;
-import android.widget.CheckBox;
-import android.widget.CompoundButton;
+import androidx.annotation.NonNull;
 
 
 import com.stardust.autojs.core.looper.Timer;
@@ -43,7 +40,7 @@ public class EventEmitter {
         }
 
         private void ensureListenersNotAtLimit() {
-            if (mMaxListeners != 0 && mListenersMap.size() >= mMaxListeners) {
+            if (mMaxListeners != 0 && mListenerWrappers.size() >= mMaxListeners) {
                 throw new ScriptException(new TooManyListenersException("max = " + mMaxListeners));
             }
         }
diff --git a/autojs/src/main/java/com/stardust/autojs/core/floaty/BaseResizableFloatyWindow.java b/autojs/src/main/java/com/stardust/autojs/core/floaty/BaseResizableFloatyWindow.java
index b0ef76ab..b27b7503 100644
--- a/autojs/src/main/java/com/stardust/autojs/core/floaty/BaseResizableFloatyWindow.java
+++ b/autojs/src/main/java/com/stardust/autojs/core/floaty/BaseResizableFloatyWindow.java
@@ -1,20 +1,17 @@
 package com.stardust.autojs.core.floaty;
 
 import android.content.Context;
-import android.graphics.PixelFormat;
-import android.os.Build;
-import android.support.annotation.Nullable;
-import android.view.Gravity;
+
+import androidx.annotation.Nullable;
+
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.Window;
 import android.view.WindowManager;
 import android.widget.FrameLayout;
 
 import com.stardust.autojs.R;
 import com.stardust.autojs.core.ui.inflater.inflaters.Exceptions;
 import com.stardust.autojs.runtime.exception.ScriptInterruptedException;
-import com.stardust.concurrent.VolatileBox;
 import com.stardust.concurrent.VolatileDispose;
 import com.stardust.enhancedfloaty.FloatyService;
 import com.stardust.enhancedfloaty.ResizableFloaty;
@@ -37,10 +34,12 @@ public class BaseResizableFloatyWindow extends ResizableFloatyWindow {
 
     private VolatileDispose<RuntimeException> mInflateException = new VolatileDispose<>();
     private View mCloseButton;
+    private int mOffset;
 
 
     public BaseResizableFloatyWindow(Context context, ViewSupplier viewSupplier) {
         this(new MyFloaty(context, viewSupplier));
+        mOffset = context.getResources().getDimensionPixelSize(R.dimen.floaty_window_offset);
     }
 
     private BaseResizableFloatyWindow(MyFloaty floaty) {
@@ -51,6 +50,26 @@ public class BaseResizableFloatyWindow extends ResizableFloatyWindow {
         return mInflateException.blockedGetOrThrow(ScriptInterruptedException.class);
     }
 
+    @Override
+    protected WindowBridge onCreateWindowBridge(WindowManager.LayoutParams params) {
+        return new WindowBridge.DefaultImpl(params, getWindowManager(), getWindowView()) {
+            @Override
+            public int getX() {
+                return super.getX() + mOffset;
+            }
+
+            @Override
+            public int getY() {
+                return super.getY() + mOffset;
+            }
+
+            @Override
+            public void updatePosition(int x, int y) {
+                super.updatePosition(x - mOffset, y - mOffset);
+            }
+        };
+    }
+
     @Override
     public void onCreate(FloatyService service, WindowManager manager) {
         try {
@@ -108,6 +127,7 @@ public class BaseResizableFloatyWindow extends ResizableFloatyWindow {
         private View mRootView;
         private Context mContext;
 
+
         public MyFloaty(Context context, ViewSupplier supplier) {
             mContentViewSupplier = supplier;
             mContext = context;
diff --git a/autojs/src/main/java/com/stardust/autojs/core/graphics/ScriptCanvas.java b/autojs/src/main/java/com/stardust/autojs/core/graphics/ScriptCanvas.java
index f135315b..d7d79df3 100644
--- a/autojs/src/main/java/com/stardust/autojs/core/graphics/ScriptCanvas.java
+++ b/autojs/src/main/java/com/stardust/autojs/core/graphics/ScriptCanvas.java
@@ -12,9 +12,10 @@ import android.graphics.Rect;
 import android.graphics.RectF;
 import android.graphics.Region;
 import android.os.Build;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.RequiresApi;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
 
 import com.stardust.autojs.core.image.ImageWrapper;
 import com.stardust.autojs.runtime.ScriptRuntime;
@@ -45,6 +46,10 @@ public class ScriptCanvas {
 
     }
 
+    public Canvas getAndroidCanvas() {
+        return mCanvas;
+    }
+
     void setCanvas(Canvas canvas) {
         mCanvas = canvas;
     }
diff --git a/autojs/src/main/java/com/stardust/autojs/core/http/MutableOkHttp.java b/autojs/src/main/java/com/stardust/autojs/core/http/MutableOkHttp.java
index b9245367..f80c5ed5 100644
--- a/autojs/src/main/java/com/stardust/autojs/core/http/MutableOkHttp.java
+++ b/autojs/src/main/java/com/stardust/autojs/core/http/MutableOkHttp.java
@@ -1,10 +1,5 @@
 package com.stardust.autojs.core.http;
 
-import android.widget.AdapterView;
-
-import java.io.IOException;
-import java.net.InetSocketAddress;
-import java.net.Proxy;
 import java.util.Collections;
 import java.util.concurrent.TimeUnit;
 
diff --git a/autojs/src/main/java/com/stardust/autojs/core/image/ColorFinder.java b/autojs/src/main/java/com/stardust/autojs/core/image/ColorFinder.java
index 38eb8f6d..cbba493c 100644
--- a/autojs/src/main/java/com/stardust/autojs/core/image/ColorFinder.java
+++ b/autojs/src/main/java/com/stardust/autojs/core/image/ColorFinder.java
@@ -2,13 +2,16 @@ package com.stardust.autojs.core.image;
 
 import android.graphics.Color;
 import android.os.Build;
-import android.support.annotation.RequiresApi;
+import androidx.annotation.RequiresApi;
 
+import com.stardust.autojs.core.opencv.MatOfPoint;
+import com.stardust.autojs.core.opencv.OpenCVHelper;
 import com.stardust.util.ScreenMetrics;
 
 import org.opencv.core.Core;
-import org.opencv.core.Mat;
-import org.opencv.core.MatOfPoint;
+
+import com.stardust.autojs.core.opencv.Mat;
+
 import org.opencv.core.Point;
 import org.opencv.core.Rect;
 import org.opencv.core.Scalar;
@@ -48,6 +51,7 @@ public class ColorFinder {
             point.x = mScreenMetrics.scaleX((int) (point.x + rect.x));
             point.y = mScreenMetrics.scaleX((int) (point.y + rect.y));
         }
+        OpenCVHelper.release(matOfPoint);
         return point;
     }
 
@@ -57,6 +61,7 @@ public class ColorFinder {
             return new Point[0];
         }
         Point[] points = matOfPoint.toArray();
+        OpenCVHelper.release(matOfPoint);
         if (rect != null) {
             for (int i = 0; i < points.length; i++) {
                 points[i].x = mScreenMetrics.scaleX((int) (points[i].x + rect.x));
@@ -85,7 +90,7 @@ public class ColorFinder {
         if (nonZeroPos.rows() == 0 || nonZeroPos.cols() == 0) {
             result = null;
         } else {
-            result = new MatOfPoint(nonZeroPos);
+            result = OpenCVHelper.newMatOfPoint(nonZeroPos);
         }
         OpenCVHelper.release(bi);
         OpenCVHelper.release(nonZeroPos);
@@ -113,7 +118,7 @@ public class ColorFinder {
             x += startingPoint.x;
             y += startingPoint.y;
             if (x >= image.getWidth() || y >= image.getHeight()
-                || x < 0 || y < 0) {
+                    || x < 0 || y < 0) {
                 return false;
             }
             int c = image.pixel(x, y);
diff --git a/autojs/src/main/java/com/stardust/autojs/core/image/Colors.java b/autojs/src/main/java/com/stardust/autojs/core/image/Colors.java
index 7e66be4e..911476f3 100644
--- a/autojs/src/main/java/com/stardust/autojs/core/image/Colors.java
+++ b/autojs/src/main/java/com/stardust/autojs/core/image/Colors.java
@@ -2,7 +2,7 @@ package com.stardust.autojs.core.image;
 
 import android.graphics.Color;
 import android.os.Build;
-import android.support.annotation.RequiresApi;
+import androidx.annotation.RequiresApi;
 
 /**
  * Created by Stardust on 2017/12/31.
diff --git a/autojs/src/main/java/com/stardust/autojs/core/image/ImageWrapper.java b/autojs/src/main/java/com/stardust/autojs/core/image/ImageWrapper.java
index 75afd7dd..358d9771 100644
--- a/autojs/src/main/java/com/stardust/autojs/core/image/ImageWrapper.java
+++ b/autojs/src/main/java/com/stardust/autojs/core/image/ImageWrapper.java
@@ -4,12 +4,13 @@ import android.graphics.Bitmap;
 import android.graphics.Color;
 import android.media.Image;
 import android.os.Build;
-import android.support.annotation.RequiresApi;
+import androidx.annotation.RequiresApi;
 
+import com.stardust.autojs.core.opencv.OpenCVHelper;
 import com.stardust.pio.UncheckedIOException;
 
 import org.opencv.android.Utils;
-import org.opencv.core.Mat;
+import com.stardust.autojs.core.opencv.Mat;
 import org.opencv.highgui.Highgui;
 
 import java.io.FileNotFoundException;
@@ -26,19 +27,19 @@ public class ImageWrapper {
     private int mHeight;
     private Bitmap mBitmap;
 
-    public ImageWrapper(Mat mat) {
+    protected ImageWrapper(Mat mat) {
         mMat = mat;
         mWidth = mat.cols();
         mHeight = mat.rows();
     }
 
-    public ImageWrapper(Bitmap bitmap) {
+    protected ImageWrapper(Bitmap bitmap) {
         mBitmap = bitmap;
         mWidth = bitmap.getWidth();
         mHeight = bitmap.getHeight();
     }
 
-    public ImageWrapper(Bitmap bitmap, Mat mat) {
+    protected ImageWrapper(Bitmap bitmap, Mat mat) {
         mBitmap = bitmap;
         mMat = mat;
         mWidth = bitmap.getWidth();
@@ -58,6 +59,14 @@ public class ImageWrapper {
         return new ImageWrapper(toBitmap(image));
     }
 
+    public static ImageWrapper ofMat(Mat mat) {
+        if (mat == null) {
+            return null;
+        }
+        return new ImageWrapper(mat);
+    }
+
+
     public static ImageWrapper ofBitmap(Bitmap bitmap) {
         if (bitmap == null) {
             return null;
@@ -123,6 +132,10 @@ public class ImageWrapper {
 
     public Bitmap getBitmap() {
         ensureNotRecycled();
+        if (mBitmap == null && mMat != null) {
+            mBitmap = Bitmap.createBitmap(mMat.width(), mMat.height(), Bitmap.Config.ARGB_8888);
+            Utils.matToBitmap(mMat, mBitmap);
+        }
         return mBitmap;
     }
 
@@ -142,4 +155,15 @@ public class ImageWrapper {
         if (mBitmap == null && mMat == null)
             throw new IllegalStateException("image has been recycled");
     }
+
+    public ImageWrapper clone() {
+        ensureNotRecycled();
+        if (mBitmap == null) {
+            return ImageWrapper.ofMat(mMat.clone());
+        }
+        if (mMat == null) {
+            return ImageWrapper.ofBitmap(mBitmap.copy(mBitmap.getConfig(), true));
+        }
+        return new ImageWrapper(mBitmap.copy(mBitmap.getConfig(), true), mMat.clone());
+    }
 }
diff --git a/autojs/src/main/java/com/stardust/autojs/core/image/TemplateMatching.java b/autojs/src/main/java/com/stardust/autojs/core/image/TemplateMatching.java
index 461352da..ef9295c3 100644
--- a/autojs/src/main/java/com/stardust/autojs/core/image/TemplateMatching.java
+++ b/autojs/src/main/java/com/stardust/autojs/core/image/TemplateMatching.java
@@ -1,14 +1,14 @@
 package com.stardust.autojs.core.image;
 
-import android.util.Log;
 import android.util.Pair;
 import android.util.TimingLogger;
 
+import com.stardust.autojs.core.opencv.OpenCVHelper;
 import com.stardust.util.Nath;
 
 import org.opencv.core.Core;
 import org.opencv.core.CvType;
-import org.opencv.core.Mat;
+import com.stardust.autojs.core.opencv.Mat;
 import org.opencv.core.Point;
 import org.opencv.core.Rect;
 import org.opencv.core.Size;
@@ -100,6 +100,7 @@ public class TemplateMatching {
         }
         logger.addSplit("result:" + p);
         logger.dumpToLog();
+        OpenCVHelper.release(matchResult);
         if (similarity < strictThreshold) {
             return null;
         }
diff --git a/autojs/src/main/java/com/stardust/autojs/core/image/capture/ScreenCaptureRequestActivity.java b/autojs/src/main/java/com/stardust/autojs/core/image/capture/ScreenCaptureRequestActivity.java
index 103039bd..453e7dbd 100644
--- a/autojs/src/main/java/com/stardust/autojs/core/image/capture/ScreenCaptureRequestActivity.java
+++ b/autojs/src/main/java/com/stardust/autojs/core/image/capture/ScreenCaptureRequestActivity.java
@@ -5,8 +5,8 @@ import android.content.Context;
 import android.content.Intent;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.annotation.RequiresApi;
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
 
 import com.stardust.app.OnActivityResultDelegate;
 import com.stardust.util.IntentExtras;
diff --git a/autojs/src/main/java/com/stardust/autojs/core/image/capture/ScreenCaptureRequester.java b/autojs/src/main/java/com/stardust/autojs/core/image/capture/ScreenCaptureRequester.java
index d88d5fd9..0e276a43 100644
--- a/autojs/src/main/java/com/stardust/autojs/core/image/capture/ScreenCaptureRequester.java
+++ b/autojs/src/main/java/com/stardust/autojs/core/image/capture/ScreenCaptureRequester.java
@@ -5,7 +5,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.media.projection.MediaProjectionManager;
 import android.os.Build;
-import android.support.annotation.RequiresApi;
+import androidx.annotation.RequiresApi;
 
 import com.stardust.app.OnActivityResultDelegate;
 
diff --git a/autojs/src/main/java/com/stardust/autojs/core/image/capture/ScreenCapturer.java b/autojs/src/main/java/com/stardust/autojs/core/image/capture/ScreenCapturer.java
index 55fc9b18..2a87fd17 100644
--- a/autojs/src/main/java/com/stardust/autojs/core/image/capture/ScreenCapturer.java
+++ b/autojs/src/main/java/com/stardust/autojs/core/image/capture/ScreenCapturer.java
@@ -14,39 +14,43 @@ import android.media.projection.MediaProjectionManager;
 import android.os.Build;
 import android.os.Handler;
 import android.os.Looper;
-import android.support.annotation.Nullable;
-import android.support.annotation.RequiresApi;
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
 import android.util.Log;
 import android.view.OrientationEventListener;
 
 import com.stardust.autojs.runtime.exception.ScriptException;
 import com.stardust.autojs.runtime.exception.ScriptInterruptedException;
+import com.stardust.lang.ThreadCompat;
 import com.stardust.util.ScreenMetrics;
 
+import java.util.concurrent.atomic.AtomicReference;
+
 /**
  * Created by Stardust on 2017/5/17.
  */
 @RequiresApi(Build.VERSION_CODES.LOLLIPOP)
 public class ScreenCapturer {
 
-    public static final int ORIENTATION_AUTO = -1;
+    public static final int ORIENTATION_AUTO = Configuration.ORIENTATION_UNDEFINED;
+    public static final int ORIENTATION_LANDSCAPE = Configuration.ORIENTATION_LANDSCAPE ;
+    public static final int ORIENTATION_PORTRAIT = Configuration.ORIENTATION_PORTRAIT ;
+
 
     private static final String LOG_TAG = "ScreenCapturer";
-    private final Object mCachedImageLock = new Object();
     private final MediaProjectionManager mProjectionManager;
     private ImageReader mImageReader;
     private MediaProjection mMediaProjection;
     private VirtualDisplay mVirtualDisplay;
     private volatile Looper mImageAcquireLooper;
     private volatile Image mUnderUsingImage;
-    private volatile Image mCachedImage;
-    private volatile boolean mImageAvailable = false;
+    private volatile AtomicReference<Image> mCachedImage = new AtomicReference<>();
     private volatile Exception mException;
     private final int mScreenDensity;
     private Handler mHandler;
     private Intent mData;
     private Context mContext;
-    private int mOrientation = Configuration.ORIENTATION_UNDEFINED;
+    private int mOrientation = -1;
     private int mDetectedOrientation;
     private OrientationEventListener mOrientationEventListener;
 
@@ -69,7 +73,12 @@ public class ScreenCapturer {
                 int orientation = mContext.getResources().getConfiguration().orientation;
                 if (mOrientation == ORIENTATION_AUTO && mDetectedOrientation != orientation) {
                     mDetectedOrientation = orientation;
-                    refreshVirtualDisplay(orientation);
+                    try {
+                        refreshVirtualDisplay(orientation);
+                    }catch (Exception e){
+                        e.printStackTrace();
+                        mException = e;
+                    }
                 }
             }
 
@@ -98,7 +107,6 @@ public class ScreenCapturer {
         if (mVirtualDisplay != null) {
             mVirtualDisplay.release();
         }
-        mImageAvailable = false;
         if (mMediaProjection != null) {
             mMediaProjection.stop();
         }
@@ -110,7 +118,7 @@ public class ScreenCapturer {
     }
 
     private void initVirtualDisplay(int width, int height, int screenDensity) {
-        mImageReader = ImageReader.newInstance(width, height, PixelFormat.RGBA_8888, 2);
+        mImageReader = ImageReader.newInstance(width, height, PixelFormat.RGBA_8888, 3);
         mVirtualDisplay = mMediaProjection.createVirtualDisplay(LOG_TAG,
                 width, height, screenDensity, DisplayManager.VIRTUAL_DISPLAY_FLAG_AUTO_MIRROR,
                 mImageReader.getSurface(), null, null);
@@ -134,18 +142,11 @@ public class ScreenCapturer {
     private void setImageListener(Handler handler) {
         mImageReader.setOnImageAvailableListener(reader -> {
             try {
-                if (mCachedImage != null) {
-                    synchronized (mCachedImageLock) {
-                        if (mCachedImage != null) {
-                            mCachedImage.close();
-                        }
-                        mCachedImage = reader.acquireLatestImage();
-                        mImageAvailable = true;
-                        mCachedImageLock.notify();
-                        return;
-                    }
+                Image oldCacheImage = mCachedImage.getAndSet(null);
+                if (oldCacheImage != null) {
+                    oldCacheImage.close();
                 }
-                mCachedImage = reader.acquireLatestImage();
+                mCachedImage.set(reader.acquireLatestImage());
             } catch (Exception e) {
                 mException = e;
             }
@@ -155,36 +156,23 @@ public class ScreenCapturer {
 
     @Nullable
     public Image capture() {
-        if (!mImageAvailable) {
-            waitForImageAvailable();
-        }
-        if (mException != null) {
-            Exception e = mException;
+        Exception e = mException;
+        if (e != null) {
             mException = null;
             throw new ScriptException(e);
         }
-        synchronized (mCachedImageLock) {
-            if (mCachedImage != null) {
-                if (mUnderUsingImage != null)
+        Thread thread = ThreadCompat.currentThread();
+        while (!thread.isInterrupted()) {
+            Image cachedImage = mCachedImage.getAndSet(null);
+            if (cachedImage != null) {
+                if (mUnderUsingImage != null) {
                     mUnderUsingImage.close();
-                mUnderUsingImage = mCachedImage;
-                mCachedImage = null;
-            }
-        }
-        return mUnderUsingImage;
-    }
-
-    private void waitForImageAvailable() {
-        synchronized (mCachedImageLock) {
-            if (mImageAvailable) {
-                return;
-            }
-            try {
-                mCachedImageLock.wait();
-            } catch (InterruptedException e) {
-                throw new ScriptInterruptedException();
+                }
+                mUnderUsingImage = cachedImage;
+                return cachedImage;
             }
         }
+        throw new ScriptInterruptedException();
     }
 
     public int getScreenDensity() {
@@ -209,8 +197,9 @@ public class ScreenCapturer {
         if (mUnderUsingImage != null) {
             mUnderUsingImage.close();
         }
-        if (mCachedImage != null) {
-            mCachedImage.close();
+        Image cachedImage = mCachedImage.getAndSet(null);
+        if (cachedImage != null) {
+            cachedImage.close();
         }
         if (mOrientationEventListener != null) {
             mOrientationEventListener.disable();
diff --git a/autojs/src/main/java/com/stardust/autojs/core/inputevent/InputDevices.java b/autojs/src/main/java/com/stardust/autojs/core/inputevent/InputDevices.java
index fecef13f..2d48a0ed 100644
--- a/autojs/src/main/java/com/stardust/autojs/core/inputevent/InputDevices.java
+++ b/autojs/src/main/java/com/stardust/autojs/core/inputevent/InputDevices.java
@@ -1,6 +1,6 @@
 package com.stardust.autojs.core.inputevent;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.util.Log;
 import android.view.InputDevice;
 
diff --git a/autojs/src/main/java/com/stardust/autojs/core/inputevent/InputEventObserver.java b/autojs/src/main/java/com/stardust/autojs/core/inputevent/InputEventObserver.java
index bec3a46d..e30d4858 100644
--- a/autojs/src/main/java/com/stardust/autojs/core/inputevent/InputEventObserver.java
+++ b/autojs/src/main/java/com/stardust/autojs/core/inputevent/InputEventObserver.java
@@ -1,7 +1,7 @@
 package com.stardust.autojs.core.inputevent;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.text.TextUtils;
 
 import com.stardust.autojs.core.record.inputevent.EventFormatException;
diff --git a/autojs/src/main/java/com/stardust/autojs/core/inputevent/RootAutomator.java b/autojs/src/main/java/com/stardust/autojs/core/inputevent/RootAutomator.java
index 3bd30802..28aa16db 100644
--- a/autojs/src/main/java/com/stardust/autojs/core/inputevent/RootAutomator.java
+++ b/autojs/src/main/java/com/stardust/autojs/core/inputevent/RootAutomator.java
@@ -2,7 +2,7 @@ package com.stardust.autojs.core.inputevent;
 
 import android.content.Context;
 import android.os.SystemClock;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.util.Log;
 import android.util.SparseIntArray;
 import android.view.ViewConfiguration;
diff --git a/autojs/src/main/java/com/stardust/autojs/core/inputevent/ShellKeyObserver.java b/autojs/src/main/java/com/stardust/autojs/core/inputevent/ShellKeyObserver.java
index abd34349..707f55bb 100644
--- a/autojs/src/main/java/com/stardust/autojs/core/inputevent/ShellKeyObserver.java
+++ b/autojs/src/main/java/com/stardust/autojs/core/inputevent/ShellKeyObserver.java
@@ -1,6 +1,6 @@
 package com.stardust.autojs.core.inputevent;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.util.SparseArray;
 
 import java.lang.reflect.Field;
diff --git a/autojs/src/main/java/com/stardust/autojs/core/inputevent/TouchObserver.java b/autojs/src/main/java/com/stardust/autojs/core/inputevent/TouchObserver.java
index a7bd64b3..95a59426 100644
--- a/autojs/src/main/java/com/stardust/autojs/core/inputevent/TouchObserver.java
+++ b/autojs/src/main/java/com/stardust/autojs/core/inputevent/TouchObserver.java
@@ -1,6 +1,6 @@
 package com.stardust.autojs.core.inputevent;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import static com.stardust.autojs.core.record.inputevent.InputEventRecorder.parseDeviceNumber;
 
diff --git a/autojs/src/main/java/com/stardust/autojs/core/looper/Loopers.java b/autojs/src/main/java/com/stardust/autojs/core/looper/Loopers.java
index 39a76b16..31b402f0 100644
--- a/autojs/src/main/java/com/stardust/autojs/core/looper/Loopers.java
+++ b/autojs/src/main/java/com/stardust/autojs/core/looper/Loopers.java
@@ -5,12 +5,15 @@ import android.os.Looper;
 import android.os.MessageQueue;
 import android.util.Log;
 
+import com.stardust.autojs.rhino.AutoJsContext;
 import com.stardust.autojs.runtime.ScriptRuntime;
 import com.stardust.autojs.runtime.api.Threads;
 import com.stardust.autojs.runtime.api.Timers;
 import com.stardust.autojs.runtime.exception.ScriptInterruptedException;
 import com.stardust.lang.ThreadCompat;
 
+import org.mozilla.javascript.Context;
+
 import java.util.HashSet;
 import java.util.concurrent.CopyOnWriteArrayList;
 
@@ -81,6 +84,9 @@ public class Loopers implements MessageQueue.IdleHandler {
         if (waitWhenIdle.get() || !waitIds.get().isEmpty()) {
             return false;
         }
+        if (((AutoJsContext) Context.getCurrentContext()).hasPendingContinuation()) {
+            return false;
+        }
         CopyOnWriteArrayList<LooperQuitHandler> handlers = looperQuitHandlers.get();
         if (handlers == null) {
             return true;
diff --git a/autojs/src/main/java/com/stardust/autojs/core/looper/TimerThread.java b/autojs/src/main/java/com/stardust/autojs/core/looper/TimerThread.java
index 70d8cd79..61dbc7e7 100644
--- a/autojs/src/main/java/com/stardust/autojs/core/looper/TimerThread.java
+++ b/autojs/src/main/java/com/stardust/autojs/core/looper/TimerThread.java
@@ -2,7 +2,7 @@ package com.stardust.autojs.core.looper;
 
 import android.os.Handler;
 import android.os.Looper;
-import android.support.annotation.CallSuper;
+import androidx.annotation.CallSuper;
 
 import com.stardust.autojs.engine.RhinoJavaScriptEngine;
 import com.stardust.autojs.runtime.ScriptRuntime;
@@ -44,7 +44,7 @@ public class TimerThread extends ThreadCompat {
         new Handler().post(mTarget);
         try {
             Looper.loop();
-        } catch (Exception e) {
+        } catch (Throwable e) {
             if (!ScriptInterruptedException.causedByInterrupted(e)) {
                 mRuntime.console.error(Thread.currentThread().toString() + ": ", e);
             }
diff --git a/autojs/src/main/java/com/stardust/autojs/core/opencv/Mat.java b/autojs/src/main/java/com/stardust/autojs/core/opencv/Mat.java
new file mode 100644
index 00000000..7a9e74be
--- /dev/null
+++ b/autojs/src/main/java/com/stardust/autojs/core/opencv/Mat.java
@@ -0,0 +1,110 @@
+package com.stardust.autojs.core.opencv;
+
+import com.stardust.util.ResourceMonitor;
+
+import org.mozilla.javascript.ScriptRuntime;
+import org.opencv.core.Range;
+import org.opencv.core.Rect;
+import org.opencv.core.Scalar;
+import org.opencv.core.Size;
+
+import java.lang.reflect.Method;
+import java.util.concurrent.atomic.AtomicInteger;
+
+public class Mat extends org.opencv.core.Mat implements ResourceMonitor.Resource {
+
+    private static Method nClone;
+
+    static {
+        try {
+            nClone = org.opencv.core.Mat.class.getDeclaredMethod("n_clone", long.class);
+            nClone.setAccessible(true);
+        } catch (NoSuchMethodException e) {
+            e.printStackTrace();
+        }
+    }
+
+    private static final AtomicInteger sResourceId = new AtomicInteger();
+    private volatile boolean mReleased = false;
+    private final int mResourceId = sResourceId.incrementAndGet();
+
+    public Mat(long addr) {
+        super(addr);
+        ResourceMonitor.onOpen(this);
+    }
+
+    public Mat() {
+        super();
+        ResourceMonitor.onOpen(this);
+    }
+
+    public Mat(int rows, int cols, int type) {
+        super(rows, cols, type);
+        ResourceMonitor.onOpen(this);
+    }
+
+    public Mat(Size size, int type) {
+        super(size, type);
+        ResourceMonitor.onOpen(this);
+    }
+
+    public Mat(int rows, int cols, int type, Scalar s) {
+        super(rows, cols, type, s);
+        ResourceMonitor.onOpen(this);
+    }
+
+    public Mat(Size size, int type, Scalar s) {
+        super(size, type, s);
+        ResourceMonitor.onOpen(this);
+    }
+
+    public Mat(Mat m, Range rowRange, Range colRange) {
+        super(m, rowRange, colRange);
+        ResourceMonitor.onOpen(this);
+    }
+
+    public Mat(Mat m, Range rowRange) {
+        super(m, rowRange);
+        ResourceMonitor.onOpen(this);
+    }
+
+    public Mat(Mat m, Rect roi) {
+        super(m, roi);
+        ResourceMonitor.onOpen(this);
+    }
+
+    @Override
+    public Mat clone() {
+        return new Mat(n_clone(this.nativeObj));
+    }
+
+    protected long n_clone(long addr) {
+        try {
+            return (long) nClone.invoke(this, addr);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @Override
+    public void release() {
+        super.release();
+        mReleased = true;
+        ResourceMonitor.onClose(this);
+    }
+
+    @Override
+    protected void finalize() throws Throwable {
+        if (!mReleased) {
+            ResourceMonitor.onFinalize(this);
+            super.release();
+            mReleased = true;
+        }
+        super.finalize();
+    }
+
+    @Override
+    public int getResourceId() {
+        return mResourceId;
+    }
+}
diff --git a/autojs/src/main/java/com/stardust/autojs/core/opencv/MatOfPoint.java b/autojs/src/main/java/com/stardust/autojs/core/opencv/MatOfPoint.java
new file mode 100644
index 00000000..1a92051a
--- /dev/null
+++ b/autojs/src/main/java/com/stardust/autojs/core/opencv/MatOfPoint.java
@@ -0,0 +1,56 @@
+package com.stardust.autojs.core.opencv;
+
+import com.stardust.util.ResourceMonitor;
+
+import org.opencv.core.Mat;
+import org.opencv.core.Point;
+
+import java.util.concurrent.atomic.AtomicInteger;
+
+public class MatOfPoint extends org.opencv.core.MatOfPoint implements ResourceMonitor.Resource {
+
+    private static final AtomicInteger sResourceId = new AtomicInteger();
+    private volatile boolean mReleased = false;
+    private final int mResourceId = sResourceId.incrementAndGet();
+
+    public MatOfPoint() {
+        super();
+        ResourceMonitor.onOpen(this);
+    }
+
+    public MatOfPoint(long addr) {
+        super(addr);
+        ResourceMonitor.onOpen(this);
+    }
+
+    public MatOfPoint(Mat m) {
+        super(m);
+        ResourceMonitor.onOpen(this);
+    }
+
+    public MatOfPoint(Point... a) {
+        super(a);
+        ResourceMonitor.onOpen(this);
+    }
+
+    @Override
+    public void release() {
+        super.release();
+        mReleased = true;
+        ResourceMonitor.onClose(this);
+    }
+
+    @Override
+    protected void finalize() throws Throwable {
+        if (!mReleased) {
+            ResourceMonitor.onFinalize(this);
+            super.release();
+        }
+        super.finalize();
+    }
+
+    @Override
+    public int getResourceId() {
+        return mResourceId;
+    }
+}
diff --git a/autojs/src/main/java/com/stardust/autojs/core/image/OpenCVHelper.java b/autojs/src/main/java/com/stardust/autojs/core/opencv/OpenCVHelper.java
similarity index 72%
rename from autojs/src/main/java/com/stardust/autojs/core/image/OpenCVHelper.java
rename to autojs/src/main/java/com/stardust/autojs/core/opencv/OpenCVHelper.java
index 06122a98..05afece4 100644
--- a/autojs/src/main/java/com/stardust/autojs/core/image/OpenCVHelper.java
+++ b/autojs/src/main/java/com/stardust/autojs/core/opencv/OpenCVHelper.java
@@ -1,15 +1,16 @@
-package com.stardust.autojs.core.image;
+package com.stardust.autojs.core.opencv;
 
-import android.app.Activity;
-import android.support.annotation.Nullable;
+import android.content.Context;
+import androidx.annotation.Nullable;
 import android.util.Log;
 
 import com.afollestad.materialdialogs.MaterialDialog;
+import com.stardust.app.DialogUtils;
 
 import org.opencv.android.InstallCallbackInterface;
 import org.opencv.android.LoaderCallbackInterface;
 import org.opencv.android.OpenCVLoader;
-import org.opencv.core.Mat;
+
 
 /**
  * Created by Stardust on 2018/4/2.
@@ -22,7 +23,17 @@ public class OpenCVHelper {
     }
 
     private static final String LOG_TAG = "OpenCVHelper";
-    private static boolean mInitialized = false;
+    private static boolean sInitialized = false;
+
+    public static MatOfPoint newMatOfPoint(Mat mat){
+        return new MatOfPoint(mat);
+    }
+
+    public static void release(@Nullable MatOfPoint mat) {
+        if (mat == null)
+            return;
+        mat.release();
+    }
 
     public static void release(@Nullable Mat mat) {
         if (mat == null)
@@ -30,13 +41,17 @@ public class OpenCVHelper {
         mat.release();
     }
 
-    public static void initIfNeeded(Activity activity, InitializeCallback callback) {
-        if (mInitialized) {
+    public synchronized static boolean isInitialized() {
+        return sInitialized;
+    }
+
+    public synchronized static void initIfNeeded(Context context, InitializeCallback callback) {
+        if (sInitialized) {
             callback.onInitFinish();
             return;
         }
-        mInitialized = true;
-        OpenCVLoader.initAsync(OpenCVLoader.OPENCV_VERSION_2_4_13, activity.getApplicationContext(), new LoaderCallback(activity) {
+        sInitialized = true;
+        OpenCVLoader.initAsync(OpenCVLoader.OPENCV_VERSION_2_4_13, context.getApplicationContext(), new LoaderCallback(context) {
 
             @Override
             protected void finish() {
@@ -45,11 +60,12 @@ public class OpenCVHelper {
         });
     }
 
-    public static class LoaderCallback implements LoaderCallbackInterface {
-        private Activity mActivity;
 
-        public LoaderCallback(Activity activity) {
-            this.mActivity = activity;
+    public static class LoaderCallback implements LoaderCallbackInterface {
+        private Context mContext;
+
+        public LoaderCallback(Context context) {
+            this.mContext = context;
         }
 
         public void onManagerConnected(int status) {
@@ -60,23 +76,23 @@ public class OpenCVHelper {
                 case 1:
                 default:
                     Log.e(LOG_TAG, "OpenCV loading failed!");
-                    new MaterialDialog.Builder(mActivity)
+                    DialogUtils.showDialog(new MaterialDialog.Builder(mContext)
                             .title("OpenCV error")
                             .content("OpenCV was not initialised correctly. Application will be shut down")
                             .cancelable(false)
                             .positiveText("OK")
                             .onPositive((dialog, which) -> finish())
-                            .show();
+                            .build());
                     break;
                 case 2:
                     Log.e(LOG_TAG, "Package installation failed!");
-                    new MaterialDialog.Builder(mActivity)
+                    DialogUtils.showDialog(new MaterialDialog.Builder(mContext)
                             .title("OpenCV Manager")
                             .content("Package installation failed!")
                             .cancelable(false)
                             .positiveText("OK")
                             .onPositive((dialog, which) -> finish())
-                            .show();
+                            .build());
                     break;
                 case 3:
                     Log.d(LOG_TAG, "OpenCV library instalation was canceled by user");
@@ -84,13 +100,13 @@ public class OpenCVHelper {
                     break;
                 case 4:
                     Log.d(LOG_TAG, "OpenCV Manager Service is uncompatible with this app!");
-                    new MaterialDialog.Builder(mActivity)
+                    DialogUtils.showDialog(new MaterialDialog.Builder(mContext)
                             .title("OpenCV Manager")
                             .content("OpenCV Manager service is incompatible with this app. Try to update it via Google Play.")
                             .cancelable(false)
                             .positiveText("OK")
                             .onPositive((dialog, which) -> finish())
-                            .show();
+                            .build());
             }
 
         }
@@ -98,7 +114,7 @@ public class OpenCVHelper {
         public void onPackageInstall(int operation, final InstallCallbackInterface callback) {
             switch (operation) {
                 case 0:
-                    new MaterialDialog.Builder(mActivity)
+                    DialogUtils.showDialog(new MaterialDialog.Builder(mContext)
                             .title("Package not found")
                             .content(callback.getPackageName() + " package was not found! Try to install it?")
                             .cancelable(false)
@@ -106,10 +122,10 @@ public class OpenCVHelper {
                             .onPositive((dialog, which) -> callback.install())
                             .negativeText("No")
                             .onNegative(((dialog, which) -> callback.cancel()))
-                            .show();
+                            .build());
                     break;
                 case 1:
-                    new MaterialDialog.Builder(mActivity)
+                    DialogUtils.showDialog(new MaterialDialog.Builder(mContext)
                             .title("OpenCV is not ready")
                             .content("Installation is in progress. Wait or exit?")
                             .cancelable(false)
@@ -117,7 +133,7 @@ public class OpenCVHelper {
                             .onPositive((dialog, which) -> callback.wait_install())
                             .negativeText("Exit")
                             .onNegative(((dialog, which) -> callback.cancel()))
-                            .show();
+                            .build());
                 default:
                     finish();
             }
@@ -125,7 +141,6 @@ public class OpenCVHelper {
         }
 
         protected void finish() {
-            mActivity.finish();
         }
     }
 
diff --git a/autojs/src/main/java/com/stardust/autojs/core/permission/OnRequestPermissionsResultCallback.java b/autojs/src/main/java/com/stardust/autojs/core/permission/OnRequestPermissionsResultCallback.java
index 20e79ec0..7a0f386f 100644
--- a/autojs/src/main/java/com/stardust/autojs/core/permission/OnRequestPermissionsResultCallback.java
+++ b/autojs/src/main/java/com/stardust/autojs/core/permission/OnRequestPermissionsResultCallback.java
@@ -1,6 +1,6 @@
 package com.stardust.autojs.core.permission;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 public interface OnRequestPermissionsResultCallback {
 
diff --git a/autojs/src/main/java/com/stardust/autojs/core/permission/PermissionRequestActivity.java b/autojs/src/main/java/com/stardust/autojs/core/permission/PermissionRequestActivity.java
index 8e964178..56b3b77c 100644
--- a/autojs/src/main/java/com/stardust/autojs/core/permission/PermissionRequestActivity.java
+++ b/autojs/src/main/java/com/stardust/autojs/core/permission/PermissionRequestActivity.java
@@ -1,12 +1,11 @@
 package com.stardust.autojs.core.permission;
 
-import android.Manifest;
 import android.app.Activity;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.RequiresApi;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
 
 public class PermissionRequestActivity extends Activity {
 
diff --git a/autojs/src/main/java/com/stardust/autojs/core/permission/PermissionRequestProxyActivity.java b/autojs/src/main/java/com/stardust/autojs/core/permission/PermissionRequestProxyActivity.java
index 26ab78ff..d5fcce80 100644
--- a/autojs/src/main/java/com/stardust/autojs/core/permission/PermissionRequestProxyActivity.java
+++ b/autojs/src/main/java/com/stardust/autojs/core/permission/PermissionRequestProxyActivity.java
@@ -1,8 +1,8 @@
 package com.stardust.autojs.core.permission;
 
 import android.os.Build;
-import android.support.annotation.NonNull;
-import android.support.annotation.RequiresApi;
+import androidx.annotation.NonNull;
+import androidx.annotation.RequiresApi;
 
 public interface PermissionRequestProxyActivity {
 
diff --git a/autojs/src/main/java/com/stardust/autojs/core/permission/Permissions.java b/autojs/src/main/java/com/stardust/autojs/core/permission/Permissions.java
index 6783dc41..dac73078 100644
--- a/autojs/src/main/java/com/stardust/autojs/core/permission/Permissions.java
+++ b/autojs/src/main/java/com/stardust/autojs/core/permission/Permissions.java
@@ -3,13 +3,11 @@ package com.stardust.autojs.core.permission;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Build;
-import android.support.annotation.RequiresApi;
+import androidx.annotation.RequiresApi;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 
 import static android.content.pm.PackageManager.PERMISSION_DENIED;
-import static android.content.pm.PackageManager.PERMISSION_GRANTED;
 
 public class Permissions {
 
diff --git a/autojs/src/main/java/com/stardust/autojs/core/permission/RequestPermissionCallbacks.java b/autojs/src/main/java/com/stardust/autojs/core/permission/RequestPermissionCallbacks.java
index cb8d18fa..cf11f92f 100644
--- a/autojs/src/main/java/com/stardust/autojs/core/permission/RequestPermissionCallbacks.java
+++ b/autojs/src/main/java/com/stardust/autojs/core/permission/RequestPermissionCallbacks.java
@@ -1,6 +1,6 @@
 package com.stardust.autojs.core.permission;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 
 import java.util.ArrayList;
diff --git a/autojs/src/main/java/com/stardust/autojs/core/plugin/Plugin.java b/autojs/src/main/java/com/stardust/autojs/core/plugin/Plugin.java
new file mode 100644
index 00000000..373ce64d
--- /dev/null
+++ b/autojs/src/main/java/com/stardust/autojs/core/plugin/Plugin.java
@@ -0,0 +1,93 @@
+package com.stardust.autojs.core.plugin;
+
+import android.content.Context;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
+
+import com.stardust.autojs.rhino.TopLevelScope;
+import com.stardust.autojs.runtime.ScriptRuntime;
+
+import java.lang.reflect.Method;
+
+public class Plugin {
+
+    public static class PluginLoadException extends RuntimeException {
+        public PluginLoadException(Throwable cause) {
+            super(cause);
+        }
+
+        public PluginLoadException(String message) {
+            super(message);
+        }
+    }
+
+    private static final String KEY_REGISTRY = "org.autojs.plugin.sdk.registry";
+
+    public static Plugin load(Context context, Context packageContext, ScriptRuntime runtime, TopLevelScope scope) {
+        try {
+            ApplicationInfo applicationInfo = packageContext.getPackageManager().getApplicationInfo(packageContext.getPackageName(), PackageManager.GET_META_DATA);
+            String registryClass = applicationInfo.metaData.getString(KEY_REGISTRY);
+            if (registryClass == null) {
+                throw new PluginLoadException("no registry in metadata");
+            }
+            Class<?> pluginClass = Class.forName(registryClass, true, packageContext.getClassLoader());
+            Method loadDefault = pluginClass.getMethod("loadDefault", Context.class, Context.class, Object.class, Object.class);
+            return Plugin.create(loadDefault.invoke(null, context, packageContext, runtime, scope));
+        } catch (PackageManager.NameNotFoundException e) {
+            return null;
+        } catch (Throwable e) {
+            e.printStackTrace();
+            throw new PluginLoadException(e);
+        }
+    }
+
+    private static Plugin create(Object pluginInstance) {
+        if (pluginInstance == null)
+            return null;
+        return new Plugin(pluginInstance);
+    }
+
+    private final Object mPluginInstance;
+    private Method mGetVersion;
+    private Method mGetScriptDir;
+    private String mMainScriptPath;
+
+    public Plugin(Object pluginInstance) {
+        mPluginInstance = pluginInstance;
+        findMethods(pluginInstance.getClass());
+    }
+
+    @SuppressWarnings("unchecked")
+    private void findMethods(Class pluginClass) {
+        try {
+            mGetVersion = pluginClass.getMethod("getVersion");
+        } catch (NoSuchMethodException e) {
+            e.printStackTrace();
+        }
+        try {
+            mGetScriptDir = pluginClass.getMethod("getAssetsScriptDir");
+        } catch (NoSuchMethodException e) {
+            e.printStackTrace();
+        }
+    }
+
+    public Object unwrap() {
+        return mPluginInstance;
+    }
+
+    public String getMainScriptPath() {
+        return mMainScriptPath;
+    }
+
+    public void setMainScriptPath(String mainScriptPath) {
+        mMainScriptPath = mainScriptPath;
+    }
+
+    public String getAssetsScriptDir() {
+        try {
+            return (String) mGetScriptDir.invoke(mPluginInstance);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+}
diff --git a/autojs/src/main/java/com/stardust/autojs/core/pref/Pref.kt b/autojs/src/main/java/com/stardust/autojs/core/pref/Pref.kt
new file mode 100644
index 00000000..846b2bc8
--- /dev/null
+++ b/autojs/src/main/java/com/stardust/autojs/core/pref/Pref.kt
@@ -0,0 +1,18 @@
+package com.stardust.autojs.core.pref
+
+import android.preference.PreferenceManager
+import com.stardust.app.GlobalAppContext
+
+object Pref {
+    private val preferences = PreferenceManager.getDefaultSharedPreferences(GlobalAppContext.get())
+
+    val isStableModeEnabled: Boolean
+        get() {
+            return preferences.getBoolean("key_stable_mode", false)
+        }
+
+    val isGestureObservingEnabled: Boolean
+        get() {
+            return preferences.getBoolean("key_gesture_observing", false)
+        }
+}
\ No newline at end of file
diff --git a/autojs/src/main/java/com/stardust/autojs/core/record/accessibility/AccessibilityActionConverter.java b/autojs/src/main/java/com/stardust/autojs/core/record/accessibility/AccessibilityActionConverter.java
index 258e88bb..ff346ba3 100644
--- a/autojs/src/main/java/com/stardust/autojs/core/record/accessibility/AccessibilityActionConverter.java
+++ b/autojs/src/main/java/com/stardust/autojs/core/record/accessibility/AccessibilityActionConverter.java
@@ -78,7 +78,7 @@ public class AccessibilityActionConverter {
             AccessibilityNodeInfo source = event.getSource();
             if (source == null)
                 return;
-            String bounds = NodeInfo.boundsToString(AccessibilityNodeInfoHelper.getBoundsInScreen(source));
+            String bounds = NodeInfo.Companion.boundsToString(AccessibilityNodeInfoHelper.INSTANCE.getBoundsInScreen(source));
             source.recycle();
             onAccessibilityEvent(event, bounds, sb);
         }
@@ -122,8 +122,8 @@ public class AccessibilityActionConverter {
             AccessibilityNodeInfo source = event.getSource();
             if (source == null)
                 return;
-            UiObject uiObject = UiObject.createRoot(service.getRootInActiveWindow());
-            List<UiObject> editableList = FilterAction.EditableFilter.findEditable(uiObject);
+            UiObject uiObject = UiObject.Companion.createRoot(service.getRootInActiveWindow());
+            List<UiObject> editableList = FilterAction.EditableFilter.Companion.findEditable(uiObject);
             int i = findInEditableList(editableList, source);
             sb.append("while(!input(").append(i).append(", \"").append(source.getText()).append("\"));");
             source.recycle();
@@ -132,7 +132,7 @@ public class AccessibilityActionConverter {
         private static int findInEditableList(List<UiObject> editableList, AccessibilityNodeInfo editable) {
             int i = 0;
             for (UiObject nodeInfo : editableList) {
-                if (AccessibilityNodeInfoHelper.getBoundsInScreen(nodeInfo).equals(AccessibilityNodeInfoHelper.getBoundsInScreen(editable))) {
+                if (AccessibilityNodeInfoHelper.INSTANCE.getBoundsInScreen(nodeInfo).equals(AccessibilityNodeInfoHelper.INSTANCE.getBoundsInScreen(editable))) {
                     return i;
                 }
                 i++;
diff --git a/autojs/src/main/java/com/stardust/autojs/core/record/inputevent/InputEventRecorder.java b/autojs/src/main/java/com/stardust/autojs/core/record/inputevent/InputEventRecorder.java
index e94c3d06..b93bb4e2 100644
--- a/autojs/src/main/java/com/stardust/autojs/core/record/inputevent/InputEventRecorder.java
+++ b/autojs/src/main/java/com/stardust/autojs/core/record/inputevent/InputEventRecorder.java
@@ -1,6 +1,6 @@
 package com.stardust.autojs.core.record.inputevent;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.stardust.autojs.core.inputevent.InputEventObserver;
 import com.stardust.autojs.core.record.Recorder;
diff --git a/autojs/src/main/java/com/stardust/autojs/core/record/inputevent/InputEventToAutoFileRecorder.java b/autojs/src/main/java/com/stardust/autojs/core/record/inputevent/InputEventToAutoFileRecorder.java
index 1b81445d..d04c74e1 100644
--- a/autojs/src/main/java/com/stardust/autojs/core/record/inputevent/InputEventToAutoFileRecorder.java
+++ b/autojs/src/main/java/com/stardust/autojs/core/record/inputevent/InputEventToAutoFileRecorder.java
@@ -1,7 +1,7 @@
 package com.stardust.autojs.core.record.inputevent;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.util.Log;
 
 import com.stardust.autojs.core.inputevent.InputEventCodes;
diff --git a/autojs/src/main/java/com/stardust/autojs/core/record/inputevent/InputEventToRootAutomatorRecorder.java b/autojs/src/main/java/com/stardust/autojs/core/record/inputevent/InputEventToRootAutomatorRecorder.java
index 30fba9b0..ab45ae84 100644
--- a/autojs/src/main/java/com/stardust/autojs/core/record/inputevent/InputEventToRootAutomatorRecorder.java
+++ b/autojs/src/main/java/com/stardust/autojs/core/record/inputevent/InputEventToRootAutomatorRecorder.java
@@ -1,6 +1,6 @@
 package com.stardust.autojs.core.record.inputevent;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.stardust.autojs.core.inputevent.InputEventCodes;
 import com.stardust.autojs.core.inputevent.InputEventObserver;
diff --git a/autojs/src/main/java/com/stardust/autojs/core/record/inputevent/InputEventToSendEventJsRecorder.java b/autojs/src/main/java/com/stardust/autojs/core/record/inputevent/InputEventToSendEventJsRecorder.java
index 50e0bfb0..e62ca55c 100644
--- a/autojs/src/main/java/com/stardust/autojs/core/record/inputevent/InputEventToSendEventJsRecorder.java
+++ b/autojs/src/main/java/com/stardust/autojs/core/record/inputevent/InputEventToSendEventJsRecorder.java
@@ -1,6 +1,6 @@
 package com.stardust.autojs.core.record.inputevent;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.stardust.autojs.core.inputevent.InputEventObserver;
 
diff --git a/autojs/src/main/java/com/stardust/autojs/core/ui/JsViewHelper.java b/autojs/src/main/java/com/stardust/autojs/core/ui/JsViewHelper.java
index d726db7d..b58b2172 100644
--- a/autojs/src/main/java/com/stardust/autojs/core/ui/JsViewHelper.java
+++ b/autojs/src/main/java/com/stardust/autojs/core/ui/JsViewHelper.java
@@ -1,6 +1,6 @@
 package com.stardust.autojs.core.ui;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.view.View;
 import android.view.ViewGroup;
 
diff --git a/autojs/src/main/java/com/stardust/autojs/core/ui/attribute/AppbarAttributes.java b/autojs/src/main/java/com/stardust/autojs/core/ui/attribute/AppbarAttributes.java
index e04582ad..ffb4a1ac 100644
--- a/autojs/src/main/java/com/stardust/autojs/core/ui/attribute/AppbarAttributes.java
+++ b/autojs/src/main/java/com/stardust/autojs/core/ui/attribute/AppbarAttributes.java
@@ -1,8 +1,8 @@
 package com.stardust.autojs.core.ui.attribute;
 
-import android.support.design.widget.AppBarLayout;
 import android.view.View;
 
+import com.google.android.material.appbar.AppBarLayout;
 import com.stardust.autojs.core.ui.inflater.ResourceParser;
 
 public class AppbarAttributes extends ViewAttributes {
diff --git a/autojs/src/main/java/com/stardust/autojs/core/ui/attribute/CardAttributes.java b/autojs/src/main/java/com/stardust/autojs/core/ui/attribute/CardAttributes.java
index 15d1b4e6..e8f622ca 100644
--- a/autojs/src/main/java/com/stardust/autojs/core/ui/attribute/CardAttributes.java
+++ b/autojs/src/main/java/com/stardust/autojs/core/ui/attribute/CardAttributes.java
@@ -1,12 +1,13 @@
 package com.stardust.autojs.core.ui.attribute;
 
 import android.graphics.Color;
-import android.support.v7.widget.CardView;
 import android.view.View;
 
 import com.stardust.autojs.core.ui.inflater.ResourceParser;
 import com.stardust.autojs.core.ui.inflater.util.Dimensions;
 
+import androidx.cardview.widget.CardView;
+
 public class CardAttributes extends ViewAttributes {
 
     public CardAttributes(ResourceParser resourceParser, View view) {
diff --git a/autojs/src/main/java/com/stardust/autojs/core/ui/attribute/FabViewAttributes.java b/autojs/src/main/java/com/stardust/autojs/core/ui/attribute/FabViewAttributes.java
index 5f1786ea..f015a985 100644
--- a/autojs/src/main/java/com/stardust/autojs/core/ui/attribute/FabViewAttributes.java
+++ b/autojs/src/main/java/com/stardust/autojs/core/ui/attribute/FabViewAttributes.java
@@ -1,10 +1,9 @@
 package com.stardust.autojs.core.ui.attribute;
 
 import android.graphics.Color;
-import android.support.design.widget.FloatingActionButton;
 import android.view.View;
-import android.widget.ImageView;
 
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import com.stardust.autojs.core.ui.inflater.ResourceParser;
 
 public class FabViewAttributes extends ImageViewAttributes {
diff --git a/autojs/src/main/java/com/stardust/autojs/core/ui/attribute/ImageViewAttributes.java b/autojs/src/main/java/com/stardust/autojs/core/ui/attribute/ImageViewAttributes.java
index 180f551b..292b1464 100644
--- a/autojs/src/main/java/com/stardust/autojs/core/ui/attribute/ImageViewAttributes.java
+++ b/autojs/src/main/java/com/stardust/autojs/core/ui/attribute/ImageViewAttributes.java
@@ -1,10 +1,9 @@
 package com.stardust.autojs.core.ui.attribute;
 
-import android.content.res.ColorStateList;
 import android.graphics.Color;
 import android.graphics.PorterDuff;
-import android.os.Build;
-import android.support.v4.widget.ImageViewCompat;
+
+import androidx.core.widget.ImageViewCompat;
 import android.view.View;
 import android.widget.ImageView;
 
diff --git a/autojs/src/main/java/com/stardust/autojs/core/ui/attribute/ViewAttributes.java b/autojs/src/main/java/com/stardust/autojs/core/ui/attribute/ViewAttributes.java
index c2b17b9b..a3579668 100644
--- a/autojs/src/main/java/com/stardust/autojs/core/ui/attribute/ViewAttributes.java
+++ b/autojs/src/main/java/com/stardust/autojs/core/ui/attribute/ViewAttributes.java
@@ -6,28 +6,23 @@ import android.graphics.Color;
 import android.graphics.PorterDuff;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
-import android.support.annotation.CallSuper;
-import android.support.v4.view.ViewCompat;
+import androidx.annotation.CallSuper;
+import androidx.core.view.ViewCompat;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewParent;
 import android.widget.CompoundButton;
 import android.widget.FrameLayout;
-import android.widget.ImageView;
 import android.widget.LinearLayout;
-import android.widget.TextView;
 
 import com.stardust.autojs.core.internal.Functions;
 import com.stardust.autojs.core.ui.inflater.ResourceParser;
-import com.stardust.autojs.core.ui.inflater.inflaters.BaseViewInflater;
 import com.stardust.autojs.core.ui.inflater.util.Dimensions;
 import com.stardust.autojs.core.ui.inflater.util.Drawables;
 import com.stardust.autojs.core.ui.inflater.util.Gravities;
 import com.stardust.autojs.core.ui.inflater.util.Ids;
 import com.stardust.autojs.core.ui.inflater.util.Strings;
-import com.stardust.autojs.rhino.debug.Dim;
 import com.stardust.util.BiMap;
-import com.stardust.util.Supplier;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
diff --git a/autojs/src/main/java/com/stardust/autojs/core/ui/attribute/ViewAttributesFactory.java b/autojs/src/main/java/com/stardust/autojs/core/ui/attribute/ViewAttributesFactory.java
index 25657256..c1db5335 100644
--- a/autojs/src/main/java/com/stardust/autojs/core/ui/attribute/ViewAttributesFactory.java
+++ b/autojs/src/main/java/com/stardust/autojs/core/ui/attribute/ViewAttributesFactory.java
@@ -1,17 +1,18 @@
 package com.stardust.autojs.core.ui.attribute;
 
-import android.support.design.widget.AppBarLayout;
-import android.support.design.widget.FloatingActionButton;
-import android.support.v7.widget.CardView;
 import android.view.View;
 import android.widget.ImageView;
-import android.widget.RadioGroup;
 import android.widget.TextView;
 
+import com.google.android.material.appbar.AppBarLayout;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import com.stardust.autojs.core.ui.inflater.ResourceParser;
 
 import java.util.HashMap;
 
+import androidx.cardview.widget.CardView;
+
+
 public class ViewAttributesFactory {
 
     interface ViewAttributesCreator {
diff --git a/autojs/src/main/java/com/stardust/autojs/core/ui/dialog/BlockedMaterialDialog.java b/autojs/src/main/java/com/stardust/autojs/core/ui/dialog/BlockedMaterialDialog.java
index 57cc2951..fb5f5766 100644
--- a/autojs/src/main/java/com/stardust/autojs/core/ui/dialog/BlockedMaterialDialog.java
+++ b/autojs/src/main/java/com/stardust/autojs/core/ui/dialog/BlockedMaterialDialog.java
@@ -5,14 +5,17 @@ import android.content.Context;
 import android.content.ContextWrapper;
 import android.os.Build;
 import android.os.Looper;
-import android.support.annotation.Nullable;
-import android.view.Window;
+
+import androidx.annotation.Nullable;
+
 import android.view.WindowManager;
 
 import com.afollestad.materialdialogs.DialogAction;
 import com.afollestad.materialdialogs.MaterialDialog;
 import com.afollestad.materialdialogs.Theme;
+import com.stardust.autojs.rhino.continuation.Continuation;
 import com.stardust.autojs.runtime.ScriptBridges;
+import com.stardust.autojs.runtime.ScriptRuntime;
 import com.stardust.autojs.runtime.exception.ScriptInterruptedException;
 import com.stardust.concurrent.VolatileDispose;
 import com.stardust.util.ArrayUtils;
@@ -63,11 +66,11 @@ public class BlockedMaterialDialog extends MaterialDialog {
         private ScriptBridges mScriptBridges;
         private boolean mNotified = false;
 
-        public Builder(Context context, UiHandler uiHandler, ScriptBridges scriptBridges, Object callback) {
+        public Builder(Context context, ScriptRuntime runtime, Object callback) {
             super(context);
             super.theme(Theme.LIGHT);
-            mUiHandler = uiHandler;
-            mScriptBridges = scriptBridges;
+            mUiHandler = runtime.uiHandler;
+            mScriptBridges = runtime.bridges;
             mCallback = callback;
             if (Looper.getMainLooper() != Looper.myLooper()) {
                 mResultBox = new VolatileDispose<>();
diff --git a/autojs/src/main/java/com/stardust/autojs/core/ui/dialog/JsDialog.java b/autojs/src/main/java/com/stardust/autojs/core/ui/dialog/JsDialog.java
index 15b94c4d..cbbcf64a 100644
--- a/autojs/src/main/java/com/stardust/autojs/core/ui/dialog/JsDialog.java
+++ b/autojs/src/main/java/com/stardust/autojs/core/ui/dialog/JsDialog.java
@@ -11,11 +11,12 @@ import android.os.Build;
 import android.os.Bundle;
 import android.os.Looper;
 import android.os.Message;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.RequiresApi;
-import android.support.annotation.UiThread;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
+import androidx.annotation.UiThread;
+import androidx.recyclerview.widget.RecyclerView;
+
 import android.view.ActionMode;
 import android.view.ContextMenu;
 import android.view.KeyEvent;
diff --git a/autojs/src/main/java/com/stardust/autojs/core/ui/dialog/JsDialogBuilder.java b/autojs/src/main/java/com/stardust/autojs/core/ui/dialog/JsDialogBuilder.java
index 17d6fde0..e089536f 100644
--- a/autojs/src/main/java/com/stardust/autojs/core/ui/dialog/JsDialogBuilder.java
+++ b/autojs/src/main/java/com/stardust/autojs/core/ui/dialog/JsDialogBuilder.java
@@ -1,15 +1,8 @@
 package com.stardust.autojs.core.ui.dialog;
 
 import android.content.Context;
-import android.content.DialogInterface;
-import android.content.res.ColorStateList;
-import android.graphics.Typeface;
-import android.graphics.drawable.Drawable;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.RecyclerView;
-import android.view.View;
-import android.widget.CompoundButton;
+
+
 import android.widget.EditText;
 
 import com.afollestad.materialdialogs.DialogAction;
@@ -20,15 +13,9 @@ import com.afollestad.materialdialogs.Theme;
 import com.stardust.autojs.core.eventloop.EventEmitter;
 import com.stardust.autojs.core.looper.Loopers;
 import com.stardust.autojs.core.looper.Timer;
-import com.stardust.autojs.core.looper.TimerThread;
-import com.stardust.autojs.runtime.ScriptBridges;
 import com.stardust.autojs.runtime.ScriptRuntime;
-import com.stardust.util.ArrayUtils;
 import com.stardust.util.UiHandler;
 
-import java.text.NumberFormat;
-import java.util.Collection;
-
 /**
  * Created by Stardust on 2018/4/17.
  */
diff --git a/autojs/src/main/java/com/stardust/autojs/core/ui/inflater/DynamicLayoutInflater.java b/autojs/src/main/java/com/stardust/autojs/core/ui/inflater/DynamicLayoutInflater.java
index 299a13fb..37c0b4fb 100644
--- a/autojs/src/main/java/com/stardust/autojs/core/ui/inflater/DynamicLayoutInflater.java
+++ b/autojs/src/main/java/com/stardust/autojs/core/ui/inflater/DynamicLayoutInflater.java
@@ -2,9 +2,8 @@ package com.stardust.autojs.core.ui.inflater;
 
 import android.content.Context;
 import android.os.Build;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.design.widget.AppBarLayout;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.view.InflateException;
@@ -20,6 +19,7 @@ import android.widget.RadioGroup;
 import android.widget.TextView;
 import android.widget.TimePicker;
 
+import com.google.android.material.appbar.AppBarLayout;
 import com.stardust.autojs.core.ui.inflater.inflaters.AppBarInflater;
 import com.stardust.autojs.core.ui.inflater.inflaters.BaseViewInflater;
 import com.stardust.autojs.core.ui.inflater.inflaters.DatePickerInflater;
diff --git a/autojs/src/main/java/com/stardust/autojs/core/ui/inflater/ViewInflater.java b/autojs/src/main/java/com/stardust/autojs/core/ui/inflater/ViewInflater.java
index 2e87e80d..e7abd6c8 100644
--- a/autojs/src/main/java/com/stardust/autojs/core/ui/inflater/ViewInflater.java
+++ b/autojs/src/main/java/com/stardust/autojs/core/ui/inflater/ViewInflater.java
@@ -1,6 +1,6 @@
 package com.stardust.autojs.core.ui.inflater;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.view.View;
 import android.view.ViewGroup;
 
diff --git a/autojs/src/main/java/com/stardust/autojs/core/ui/inflater/inflaters/AppBarInflater.java b/autojs/src/main/java/com/stardust/autojs/core/ui/inflater/inflaters/AppBarInflater.java
index 279a5c82..ec1cbe58 100644
--- a/autojs/src/main/java/com/stardust/autojs/core/ui/inflater/inflaters/AppBarInflater.java
+++ b/autojs/src/main/java/com/stardust/autojs/core/ui/inflater/inflaters/AppBarInflater.java
@@ -1,11 +1,10 @@
 package com.stardust.autojs.core.ui.inflater.inflaters;
 
-import android.content.Context;
-import android.support.annotation.Nullable;
-import android.support.design.widget.AppBarLayout;
+import androidx.annotation.Nullable;
 import android.view.View;
 import android.view.ViewGroup;
 
+import com.google.android.material.appbar.AppBarLayout;
 import com.stardust.autojs.R;
 import com.stardust.autojs.core.ui.inflater.ResourceParser;
 import com.stardust.autojs.core.ui.inflater.ViewCreator;
diff --git a/autojs/src/main/java/com/stardust/autojs/core/ui/inflater/inflaters/BaseViewInflater.java b/autojs/src/main/java/com/stardust/autojs/core/ui/inflater/inflaters/BaseViewInflater.java
index 67bc354e..a4a24cdc 100644
--- a/autojs/src/main/java/com/stardust/autojs/core/ui/inflater/inflaters/BaseViewInflater.java
+++ b/autojs/src/main/java/com/stardust/autojs/core/ui/inflater/inflaters/BaseViewInflater.java
@@ -3,8 +3,7 @@ package com.stardust.autojs.core.ui.inflater.inflaters;
 import android.content.res.ColorStateList;
 import android.graphics.PorterDuff;
 import android.os.Build;
-import android.support.annotation.Nullable;
-import android.support.v4.widget.DrawerLayout;
+import androidx.annotation.Nullable;
 import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/autojs/src/main/java/com/stardust/autojs/core/ui/inflater/inflaters/CanvasViewInflater.java b/autojs/src/main/java/com/stardust/autojs/core/ui/inflater/inflaters/CanvasViewInflater.java
index 5fe1a47b..1c5309b7 100644
--- a/autojs/src/main/java/com/stardust/autojs/core/ui/inflater/inflaters/CanvasViewInflater.java
+++ b/autojs/src/main/java/com/stardust/autojs/core/ui/inflater/inflaters/CanvasViewInflater.java
@@ -1,6 +1,6 @@
 package com.stardust.autojs.core.ui.inflater.inflaters;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import com.stardust.autojs.core.graphics.ScriptCanvasView;
 import com.stardust.autojs.core.ui.inflater.ResourceParser;
diff --git a/autojs/src/main/java/com/stardust/autojs/core/ui/inflater/inflaters/DatePickerInflater.java b/autojs/src/main/java/com/stardust/autojs/core/ui/inflater/inflaters/DatePickerInflater.java
index b03f73f1..e09b8ca8 100644
--- a/autojs/src/main/java/com/stardust/autojs/core/ui/inflater/inflaters/DatePickerInflater.java
+++ b/autojs/src/main/java/com/stardust/autojs/core/ui/inflater/inflaters/DatePickerInflater.java
@@ -1,7 +1,7 @@
 package com.stardust.autojs.core.ui.inflater.inflaters;
 
 import android.os.Build;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.view.InflateException;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/autojs/src/main/java/com/stardust/autojs/core/ui/inflater/inflaters/JsGridViewInflater.java b/autojs/src/main/java/com/stardust/autojs/core/ui/inflater/inflaters/JsGridViewInflater.java
index 4ce3e610..6136d65e 100644
--- a/autojs/src/main/java/com/stardust/autojs/core/ui/inflater/inflaters/JsGridViewInflater.java
+++ b/autojs/src/main/java/com/stardust/autojs/core/ui/inflater/inflaters/JsGridViewInflater.java
@@ -1,7 +1,8 @@
 package com.stardust.autojs.core.ui.inflater.inflaters;
 
-import android.support.annotation.Nullable;
-import android.support.v7.widget.GridLayoutManager;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.GridLayoutManager;
+
 import android.view.ViewGroup;
 
 import com.stardust.autojs.core.ui.inflater.ResourceParser;
diff --git a/autojs/src/main/java/com/stardust/autojs/core/ui/inflater/inflaters/JsImageViewInflater.java b/autojs/src/main/java/com/stardust/autojs/core/ui/inflater/inflaters/JsImageViewInflater.java
index 8fda1810..9e0a4e80 100644
--- a/autojs/src/main/java/com/stardust/autojs/core/ui/inflater/inflaters/JsImageViewInflater.java
+++ b/autojs/src/main/java/com/stardust/autojs/core/ui/inflater/inflaters/JsImageViewInflater.java
@@ -1,6 +1,6 @@
 package com.stardust.autojs.core.ui.inflater.inflaters;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.view.ViewGroup;
 import android.widget.ImageView.ScaleType;
 
diff --git a/autojs/src/main/java/com/stardust/autojs/core/ui/inflater/inflaters/JsListViewInflater.java b/autojs/src/main/java/com/stardust/autojs/core/ui/inflater/inflaters/JsListViewInflater.java
index d4a12ad4..fab6ee1b 100644
--- a/autojs/src/main/java/com/stardust/autojs/core/ui/inflater/inflaters/JsListViewInflater.java
+++ b/autojs/src/main/java/com/stardust/autojs/core/ui/inflater/inflaters/JsListViewInflater.java
@@ -1,9 +1,7 @@
 package com.stardust.autojs.core.ui.inflater.inflaters;
 
-import android.support.annotation.Nullable;
-import android.support.v7.widget.LinearLayoutManager;
+import androidx.annotation.Nullable;
 import android.view.ViewGroup;
-import android.widget.LinearLayout;
 
 import com.stardust.autojs.core.ui.inflater.DynamicLayoutInflater;
 import com.stardust.autojs.core.ui.inflater.ResourceParser;
diff --git a/autojs/src/main/java/com/stardust/autojs/core/ui/inflater/inflaters/SpinnerInflater.java b/autojs/src/main/java/com/stardust/autojs/core/ui/inflater/inflaters/SpinnerInflater.java
index 8c3a2a4a..bf6c486f 100644
--- a/autojs/src/main/java/com/stardust/autojs/core/ui/inflater/inflaters/SpinnerInflater.java
+++ b/autojs/src/main/java/com/stardust/autojs/core/ui/inflater/inflaters/SpinnerInflater.java
@@ -1,16 +1,11 @@
 package com.stardust.autojs.core.ui.inflater.inflaters;
 
-import android.content.Context;
-import android.os.Build;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.util.TypedValue;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import android.view.ViewGroup;
-import android.widget.ArrayAdapter;
-import android.widget.SimpleAdapter;
 import android.widget.Spinner;
 
-import com.stardust.autojs.R;
 import com.stardust.autojs.core.ui.inflater.ResourceParser;
 import com.stardust.autojs.core.ui.inflater.ViewCreator;
 import com.stardust.autojs.core.ui.inflater.util.Colors;
@@ -19,7 +14,6 @@ import com.stardust.autojs.core.ui.inflater.util.Strings;
 import com.stardust.autojs.core.ui.inflater.util.ValueMapper;
 import com.stardust.autojs.core.ui.widget.JsSpinner;
 
-import java.util.List;
 import java.util.Map;
 
 /**
diff --git a/autojs/src/main/java/com/stardust/autojs/core/ui/inflater/inflaters/TabLayoutInflater.java b/autojs/src/main/java/com/stardust/autojs/core/ui/inflater/inflaters/TabLayoutInflater.java
index cbb3d309..4b966dcb 100644
--- a/autojs/src/main/java/com/stardust/autojs/core/ui/inflater/inflaters/TabLayoutInflater.java
+++ b/autojs/src/main/java/com/stardust/autojs/core/ui/inflater/inflaters/TabLayoutInflater.java
@@ -2,11 +2,11 @@ package com.stardust.autojs.core.ui.inflater.inflaters;
 
 import android.content.res.ColorStateList;
 import android.graphics.Color;
-import android.support.annotation.Nullable;
-import android.support.design.widget.TabLayout;
+import androidx.annotation.Nullable;
 import android.view.View;
 import android.view.ViewGroup;
 
+import com.google.android.material.tabs.TabLayout;
 import com.stardust.autojs.R;
 import com.stardust.autojs.core.ui.inflater.ResourceParser;
 import com.stardust.autojs.core.ui.inflater.ViewCreator;
diff --git a/autojs/src/main/java/com/stardust/autojs/core/ui/inflater/inflaters/TextViewInflater.java b/autojs/src/main/java/com/stardust/autojs/core/ui/inflater/inflaters/TextViewInflater.java
index 42991d06..fc3128fb 100644
--- a/autojs/src/main/java/com/stardust/autojs/core/ui/inflater/inflaters/TextViewInflater.java
+++ b/autojs/src/main/java/com/stardust/autojs/core/ui/inflater/inflaters/TextViewInflater.java
@@ -350,6 +350,7 @@ public class TextViewInflater<V extends TextView> extends BaseViewInflater<V> {
             case "textColor":
                 view.setTextColor(Colors.parse(view.getContext(), value));
                 break;
+            case "size":
             case "textSize":
                 view.setTextSize(TypedValue.COMPLEX_UNIT_PX, Dimensions.parseToPixel(value, view));
                 break;
diff --git a/autojs/src/main/java/com/stardust/autojs/core/ui/inflater/inflaters/TimePickerInflater.java b/autojs/src/main/java/com/stardust/autojs/core/ui/inflater/inflaters/TimePickerInflater.java
index 1737f641..a6702c2b 100644
--- a/autojs/src/main/java/com/stardust/autojs/core/ui/inflater/inflaters/TimePickerInflater.java
+++ b/autojs/src/main/java/com/stardust/autojs/core/ui/inflater/inflaters/TimePickerInflater.java
@@ -1,6 +1,6 @@
 package com.stardust.autojs.core.ui.inflater.inflaters;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.view.View;
 import android.widget.TimePicker;
 
diff --git a/autojs/src/main/java/com/stardust/autojs/core/ui/inflater/inflaters/ToolbarInflater.java b/autojs/src/main/java/com/stardust/autojs/core/ui/inflater/inflaters/ToolbarInflater.java
index edb2d0e7..6ceccd4d 100644
--- a/autojs/src/main/java/com/stardust/autojs/core/ui/inflater/inflaters/ToolbarInflater.java
+++ b/autojs/src/main/java/com/stardust/autojs/core/ui/inflater/inflaters/ToolbarInflater.java
@@ -1,8 +1,7 @@
 package com.stardust.autojs.core.ui.inflater.inflaters;
 
-import android.content.Context;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.Toolbar;
+import androidx.annotation.Nullable;
+import androidx.appcompat.widget.Toolbar;
 import android.view.View;
 import android.view.ViewGroup;
 
diff --git a/autojs/src/main/java/com/stardust/autojs/core/ui/inflater/util/Dimensions.java b/autojs/src/main/java/com/stardust/autojs/core/ui/inflater/util/Dimensions.java
index 6786adc1..cc0d4117 100644
--- a/autojs/src/main/java/com/stardust/autojs/core/ui/inflater/util/Dimensions.java
+++ b/autojs/src/main/java/com/stardust/autojs/core/ui/inflater/util/Dimensions.java
@@ -2,8 +2,6 @@ package com.stardust.autojs.core.ui.inflater.util;
 
 import android.content.Context;
 import android.content.res.TypedArray;
-import android.support.v7.widget.CardView;
-import android.util.DisplayMetrics;
 import android.util.TypedValue;
 import android.view.InflateException;
 import android.view.View;
diff --git a/autojs/src/main/java/com/stardust/autojs/core/ui/nativeview/ViewPrototype.java b/autojs/src/main/java/com/stardust/autojs/core/ui/nativeview/ViewPrototype.java
index 3d2ded89..fbd102b6 100644
--- a/autojs/src/main/java/com/stardust/autojs/core/ui/nativeview/ViewPrototype.java
+++ b/autojs/src/main/java/com/stardust/autojs/core/ui/nativeview/ViewPrototype.java
@@ -3,7 +3,7 @@ package com.stardust.autojs.core.ui.nativeview;
 import android.annotation.SuppressLint;
 import android.os.Build;
 import android.os.Looper;
-import android.support.v4.view.ViewCompat;
+import androidx.core.view.ViewCompat;
 import android.view.MotionEvent;
 import android.view.View;
 import android.widget.CompoundButton;
@@ -18,7 +18,6 @@ import org.mozilla.javascript.Scriptable;
 import org.mozilla.javascript.Undefined;
 
 import java.util.Collections;
-import java.util.HashSet;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
diff --git a/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsButton.java b/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsButton.java
index 89a1a8f5..126eec6d 100644
--- a/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsButton.java
+++ b/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsButton.java
@@ -3,7 +3,7 @@ package com.stardust.autojs.core.ui.widget;
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.os.Build;
-import android.support.annotation.RequiresApi;
+import androidx.annotation.RequiresApi;
 import android.util.AttributeSet;
 import android.widget.Button;
 
diff --git a/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsEditText.java b/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsEditText.java
index a4e8bfb3..9c050659 100644
--- a/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsEditText.java
+++ b/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsEditText.java
@@ -3,7 +3,7 @@ package com.stardust.autojs.core.ui.widget;
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.os.Build;
-import android.support.annotation.RequiresApi;
+import androidx.annotation.RequiresApi;
 import android.util.AttributeSet;
 import android.widget.EditText;
 
diff --git a/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsFrameLayout.java b/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsFrameLayout.java
index a72f141c..3cad32db 100644
--- a/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsFrameLayout.java
+++ b/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsFrameLayout.java
@@ -2,11 +2,11 @@ package com.stardust.autojs.core.ui.widget;
 
 import android.content.Context;
 import android.os.Build;
-import android.support.annotation.AttrRes;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.RequiresApi;
-import android.support.annotation.StyleRes;
+import androidx.annotation.AttrRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
+import androidx.annotation.StyleRes;
 import android.util.AttributeSet;
 import android.view.View;
 import android.widget.FrameLayout;
diff --git a/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsGridView.java b/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsGridView.java
index 48162f06..d4e5ebd4 100644
--- a/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsGridView.java
+++ b/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsGridView.java
@@ -1,10 +1,12 @@
 package com.stardust.autojs.core.ui.widget;
 
 import android.content.Context;
-import android.support.v7.widget.GridLayoutManager;
 
 import com.stardust.autojs.runtime.ScriptRuntime;
 
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
 /**
  * Created by Stardust on 2018/3/30.
  */
@@ -20,7 +22,7 @@ public class JsGridView extends JsListView {
         super.init();
         setLayoutManager(new GridLayoutManager(getContext(), 1){
             @Override
-            public void onLayoutChildren(Recycler recycler, State state) {
+            public void onLayoutChildren(RecyclerView.Recycler recycler, RecyclerView.State state) {
                 try {
                     super.onLayoutChildren(recycler, state);
                 } catch (IndexOutOfBoundsException e) {
diff --git a/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsImageView.java b/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsImageView.java
index 14e5603a..97b56860 100644
--- a/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsImageView.java
+++ b/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsImageView.java
@@ -1,8 +1,8 @@
 package com.stardust.autojs.core.ui.widget;
 
 import android.content.Context;
-import android.support.v4.widget.ImageViewCompat;
-import android.support.v7.widget.AppCompatImageView;
+import androidx.core.widget.ImageViewCompat;
+import androidx.appcompat.widget.AppCompatImageView;
 import android.util.AttributeSet;
 
 import com.makeramen.roundedimageview.RoundedImageView;
diff --git a/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsLinearLayout.java b/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsLinearLayout.java
index 04fc4ee9..1ec5ec79 100644
--- a/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsLinearLayout.java
+++ b/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsLinearLayout.java
@@ -2,8 +2,8 @@ package com.stardust.autojs.core.ui.widget;
 
 import android.content.Context;
 import android.os.Build;
-import android.support.annotation.Nullable;
-import android.support.annotation.RequiresApi;
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
 import android.util.AttributeSet;
 import android.view.View;
 import android.widget.LinearLayout;
diff --git a/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsListView.java b/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsListView.java
index 9bf3013a..0e849373 100644
--- a/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsListView.java
+++ b/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsListView.java
@@ -1,7 +1,6 @@
 package com.stardust.autojs.core.ui.widget;
 
 import android.content.Context;
-import android.support.v7.widget.RecyclerView;
 import android.view.View;
 import android.view.ViewGroup;
 
@@ -16,6 +15,8 @@ import org.w3c.dom.NodeList;
 
 import com.stardust.autojs.workground.WrapContentLinearLayoutManager;
 
+import androidx.recyclerview.widget.RecyclerView;
+
 /**
  * Created by Stardust on 2018/3/28.
  */
diff --git a/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsRelativeLayout.java b/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsRelativeLayout.java
index e8335c18..703c3f6c 100644
--- a/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsRelativeLayout.java
+++ b/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsRelativeLayout.java
@@ -2,7 +2,7 @@ package com.stardust.autojs.core.ui.widget;
 
 import android.content.Context;
 import android.os.Build;
-import android.support.annotation.RequiresApi;
+import androidx.annotation.RequiresApi;
 import android.util.AttributeSet;
 import android.view.View;
 import android.widget.RelativeLayout;
diff --git a/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsSpinner.java b/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsSpinner.java
index 8649d7f4..ea77c62a 100644
--- a/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsSpinner.java
+++ b/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsSpinner.java
@@ -2,17 +2,16 @@ package com.stardust.autojs.core.ui.widget;
 
 import android.content.Context;
 import android.content.res.Resources;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.util.AttributeSet;
 import android.util.TypedValue;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
-import android.widget.Spinner;
 import android.widget.TextView;
 
-public class JsSpinner extends android.support.v7.widget.AppCompatSpinner {
+public class JsSpinner extends androidx.appcompat.widget.AppCompatSpinner {
 
     private float mTextSize = -1;
     private int mTextStyle = -1;
diff --git a/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsTabLayout.java b/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsTabLayout.java
index 9ae92acd..88f7aef3 100644
--- a/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsTabLayout.java
+++ b/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsTabLayout.java
@@ -1,16 +1,9 @@
 package com.stardust.autojs.core.ui.widget;
 
 import android.content.Context;
-import android.support.annotation.Nullable;
-import android.support.design.widget.TabLayout;
-import android.support.v4.view.ViewPager;
-import android.support.v4.widget.DrawerLayout;
 import android.util.AttributeSet;
-import android.view.Gravity;
 
-import com.stardust.autojs.runtime.api.UI;
-
-import org.mozilla.javascript.NativeObject;
+import com.google.android.material.tabs.TabLayout;
 
 public class JsTabLayout extends TabLayout {
 
diff --git a/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsTextView.java b/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsTextView.java
index 77ff12ac..9341b1d8 100644
--- a/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsTextView.java
+++ b/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsTextView.java
@@ -2,12 +2,11 @@ package com.stardust.autojs.core.ui.widget;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
-import android.os.Build;
-import android.support.annotation.Nullable;
-import android.support.annotation.RequiresApi;
-import android.support.v7.widget.AppCompatTextView;
+
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
+import androidx.appcompat.widget.AppCompatTextView;
 import android.util.AttributeSet;
-import android.widget.TextView;
 
 /**
  * Created by Stardust on 2017/5/15.
diff --git a/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsToolbar.java b/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsToolbar.java
index 5c9fe28d..95304c6e 100644
--- a/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsToolbar.java
+++ b/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsToolbar.java
@@ -3,10 +3,11 @@ package com.stardust.autojs.core.ui.widget;
 import android.app.Activity;
 import android.content.Context;
 import android.content.ContextWrapper;
-import android.support.annotation.Nullable;
-import android.support.v4.widget.DrawerLayout;
-import android.support.v7.app.ActionBarDrawerToggle;
-import android.support.v7.widget.Toolbar;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.ActionBarDrawerToggle;
+import androidx.appcompat.widget.Toolbar;
+import androidx.drawerlayout.widget.DrawerLayout;
+
 import android.util.AttributeSet;
 
 import com.stardust.autojs.R;
diff --git a/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsViewPager.java b/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsViewPager.java
index 748a84ca..04fa1793 100644
--- a/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsViewPager.java
+++ b/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsViewPager.java
@@ -1,17 +1,16 @@
 package com.stardust.autojs.core.ui.widget;
 
 import android.content.Context;
-import android.graphics.Bitmap;
-import android.support.design.widget.TabLayout;
-import android.support.v4.view.PagerAdapter;
-import android.support.v4.view.ViewPager;
+
 import android.util.AttributeSet;
-import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 
 import com.stardust.autojs.core.ui.inflater.ShouldCallOnFinishInflate;
 
+import androidx.viewpager.widget.PagerAdapter;
+import androidx.viewpager.widget.ViewPager;
+
 public class JsViewPager extends ViewPager implements ShouldCallOnFinishInflate {
 
     private String[] mTitles;
diff --git a/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsWebView.java b/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsWebView.java
index 510a2b0d..f629fa04 100644
--- a/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsWebView.java
+++ b/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsWebView.java
@@ -2,7 +2,7 @@ package com.stardust.autojs.core.ui.widget;
 
 import android.content.Context;
 import android.os.Build;
-import android.support.annotation.RequiresApi;
+import androidx.annotation.RequiresApi;
 import android.util.AttributeSet;
 import android.webkit.WebChromeClient;
 import android.webkit.WebSettings;
diff --git a/autojs/src/main/java/com/stardust/autojs/core/ui/xml/XmlConverter.java b/autojs/src/main/java/com/stardust/autojs/core/ui/xml/XmlConverter.java
index 7b4f2efd..a39de109 100644
--- a/autojs/src/main/java/com/stardust/autojs/core/ui/xml/XmlConverter.java
+++ b/autojs/src/main/java/com/stardust/autojs/core/ui/xml/XmlConverter.java
@@ -1,13 +1,9 @@
 package com.stardust.autojs.core.ui.xml;
 
-import android.support.design.widget.AppBarLayout;
-import android.support.design.widget.FloatingActionButton;
-import android.support.design.widget.TabLayout;
-import android.support.v4.widget.DrawerLayout;
-import android.support.v7.widget.CardView;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.Toolbar;
-import android.webkit.WebView;
+import androidx.appcompat.widget.Toolbar;
+import androidx.cardview.widget.CardView;
+import androidx.drawerlayout.widget.DrawerLayout;
+
 import android.widget.CheckBox;
 import android.widget.DatePicker;
 import android.widget.ProgressBar;
@@ -15,9 +11,10 @@ import android.widget.RadioButton;
 import android.widget.RadioGroup;
 import android.widget.ScrollView;
 import android.widget.SeekBar;
-import android.widget.Spinner;
 import android.widget.TimePicker;
 
+import com.google.android.material.appbar.AppBarLayout;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import com.stardust.autojs.core.graphics.ScriptCanvasView;
 import com.stardust.autojs.core.ui.widget.JsButton;
 import com.stardust.autojs.core.ui.widget.JsEditText;
@@ -43,7 +40,6 @@ import org.xml.sax.SAXException;
 
 import java.io.IOException;
 import java.io.StringReader;
-import java.util.Date;
 
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
diff --git a/autojs/src/main/java/com/stardust/autojs/core/util/ScriptPromiseAdapter.kt b/autojs/src/main/java/com/stardust/autojs/core/util/ScriptPromiseAdapter.kt
new file mode 100644
index 00000000..3e116da5
--- /dev/null
+++ b/autojs/src/main/java/com/stardust/autojs/core/util/ScriptPromiseAdapter.kt
@@ -0,0 +1,49 @@
+package com.stardust.autojs.core.util
+
+import com.stardust.autojs.core.internal.Functions
+
+class ScriptPromiseAdapter {
+
+    interface Callback {
+        fun call(arg: Any?)
+    }
+
+    private var mResolveCallback: Callback? = null
+    private var mRejectCallback: Callback? = null
+    private var mResult: Any? = UNSET
+    private var mError: Any? = UNSET
+
+    fun onResolve(callback: Callback): ScriptPromiseAdapter {
+        mResolveCallback = callback
+        mResult.let {
+            if (it !== UNSET) {
+                callback.call(it)
+            }
+        }
+        return this
+    }
+
+    fun onReject(callback: Callback): ScriptPromiseAdapter {
+        mRejectCallback = callback
+        mError.let {
+            if (it !== UNSET) {
+                callback.call(it)
+            }
+        }
+        return this
+    }
+
+    fun resolve(result: Any?) {
+        mResult = result
+        mResolveCallback?.call(result)
+    }
+
+    fun reject(error: Any?) {
+        mError = error
+        mRejectCallback?.call(error)
+    }
+
+    companion object {
+        private val UNSET = Object()
+    }
+}
\ No newline at end of file
diff --git a/autojs/src/main/java/com/stardust/autojs/engine/JavaScriptEngine.java b/autojs/src/main/java/com/stardust/autojs/engine/JavaScriptEngine.java
index 957d4c69..586ade0d 100644
--- a/autojs/src/main/java/com/stardust/autojs/engine/JavaScriptEngine.java
+++ b/autojs/src/main/java/com/stardust/autojs/engine/JavaScriptEngine.java
@@ -1,8 +1,5 @@
 package com.stardust.autojs.engine;
 
-import android.support.annotation.CallSuper;
-
-import com.stardust.autojs.execution.ScriptExecution;
 import com.stardust.autojs.runtime.ScriptRuntime;
 import com.stardust.autojs.script.JavaScriptSource;
 import com.stardust.autojs.script.ScriptSource;
@@ -13,6 +10,7 @@ import com.stardust.autojs.script.ScriptSource;
 
 public abstract class JavaScriptEngine extends ScriptEngine.AbstractScriptEngine<JavaScriptSource> {
     private ScriptRuntime mRuntime;
+    private Object mExecArgv;
 
     @Override
     public Object execute(JavaScriptSource scriptSource) {
@@ -45,6 +43,17 @@ public abstract class JavaScriptEngine extends ScriptEngine.AbstractScriptEngine
         return (ScriptSource) getTag(TAG_SOURCE);
     }
 
+    public void setExecArgv(Object execArgv) {
+        if (mExecArgv != null) {
+            return;
+        }
+        mExecArgv = execArgv;
+    }
+
+    public Object getExecArgv() {
+        return mExecArgv;
+    }
+
     @Override
     public synchronized void destroy() {
         mRuntime.onExit();
@@ -54,6 +63,7 @@ public abstract class JavaScriptEngine extends ScriptEngine.AbstractScriptEngine
     @Override
     public String toString() {
         return "ScriptEngine@" + Integer.toHexString(hashCode()) + "{" +
+                "id=" + getId() + "," +
                 "source='" + getTag(TAG_SOURCE) + "'," +
                 "cwd='" + cwd() + "'" +
                 "}";
diff --git a/autojs/src/main/java/com/stardust/autojs/engine/LoopBasedJavaScriptEngine.java b/autojs/src/main/java/com/stardust/autojs/engine/LoopBasedJavaScriptEngine.java
index 6f1dee1b..9c118f70 100644
--- a/autojs/src/main/java/com/stardust/autojs/engine/LoopBasedJavaScriptEngine.java
+++ b/autojs/src/main/java/com/stardust/autojs/engine/LoopBasedJavaScriptEngine.java
@@ -12,6 +12,8 @@ import com.stardust.autojs.script.JavaScriptSource;
 import com.stardust.autojs.script.ScriptSource;
 import com.stardust.util.Callback;
 
+import org.mozilla.javascript.ContinuationPending;
+
 /**
  * Created by Stardust on 2017/7/28.
  */
@@ -44,8 +46,8 @@ public class LoopBasedJavaScriptEngine extends RhinoJavaScriptEngine {
                 Object o = LoopBasedJavaScriptEngine.super.execute((JavaScriptSource) source);
                 if (callback != null)
                     callback.onResult(o);
+            } catch (ContinuationPending ignored) {
             } catch (Exception e) {
-                Log.d("DDDDD", "execute: "  + e.getMessage());
                 if (callback == null) {
                     throw e;
                 } else {
@@ -58,8 +60,17 @@ public class LoopBasedJavaScriptEngine extends RhinoJavaScriptEngine {
         mHandler.post(r);
         if (!mLooping && Looper.myLooper() != Looper.getMainLooper()) {
             mLooping = true;
-            Looper.loop();
-            mLooping = false;
+            while (true) {
+                try {
+                    Looper.loop();
+                } catch (ContinuationPending ignored) {
+                    continue;
+                } catch (Throwable t) {
+                    mLooping = false;
+                    throw t;
+                }
+                break;
+            }
         }
     }
 
@@ -76,8 +87,7 @@ public class LoopBasedJavaScriptEngine extends RhinoJavaScriptEngine {
     @Override
     public synchronized void destroy() {
         Thread thread = getThread();
-        if (thread != null)
-            LooperHelper.quitForThread(thread);
+        LooperHelper.quitForThread(thread);
         super.destroy();
     }
 
diff --git a/autojs/src/main/java/com/stardust/autojs/engine/RhinoJavaScriptEngine.java b/autojs/src/main/java/com/stardust/autojs/engine/RhinoJavaScriptEngine.java
deleted file mode 100644
index 8009a8d9..00000000
--- a/autojs/src/main/java/com/stardust/autojs/engine/RhinoJavaScriptEngine.java
+++ /dev/null
@@ -1,201 +0,0 @@
-package com.stardust.autojs.engine;
-
-import android.util.Log;
-import android.view.View;
-
-import com.stardust.autojs.BuildConfig;
-import com.stardust.autojs.core.ui.ViewExtras;
-import com.stardust.autojs.rhino.NativeArrayLikeJavaObject;
-import com.stardust.autojs.rhino.RhinoAndroidHelper;
-import com.stardust.autojs.rhino.TopLevelScope;
-import com.stardust.autojs.script.JavaScriptSource;
-import com.stardust.autojs.script.StringScriptSource;
-import com.stardust.automator.UiObject;
-import com.stardust.automator.UiObjectCollection;
-import com.stardust.pio.PFiles;
-import com.stardust.pio.UncheckedIOException;
-
-import org.mozilla.javascript.Context;
-import org.mozilla.javascript.NativeArray;
-import org.mozilla.javascript.Scriptable;
-import org.mozilla.javascript.ScriptableObject;
-import org.mozilla.javascript.TopLevel;
-import org.mozilla.javascript.commonjs.module.RequireBuilder;
-import org.mozilla.javascript.commonjs.module.provider.SoftCachingModuleScriptProvider;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.Reader;
-import java.util.Collections;
-import java.util.Locale;
-import java.util.concurrent.ConcurrentHashMap;
-
-/**
- * Created by Stardust on 2017/4/2.
- */
-
-public class RhinoJavaScriptEngine extends JavaScriptEngine {
-
-    public static final String SOURCE_NAME_INIT = "<init>";
-
-    private static final String LOG_TAG = "RhinoJavaScriptEngine";
-
-    private static final String MODULES_PATH = "modules";
-    private static StringScriptSource sInitScript;
-    private static final ConcurrentHashMap<Context, RhinoJavaScriptEngine> sContextEngineMap = new ConcurrentHashMap<>();
-
-    private Context mContext;
-    private TopLevelScope mScriptable;
-    private Thread mThread;
-    private android.content.Context mAndroidContext;
-
-    public RhinoJavaScriptEngine(android.content.Context context) {
-        mAndroidContext = context;
-        mContext = enterContext();
-        mScriptable = createScope(mContext);
-    }
-
-    @Override
-    public void put(String name, Object value) {
-        ScriptableObject.putProperty(mScriptable, name, Context.javaToJS(value, mScriptable));
-    }
-
-    @Override
-    public Object doExecution(JavaScriptSource source) {
-        Reader reader = source.getNonNullScriptReader();
-        try {
-            reader = preprocess(reader);
-            return mContext.evaluateReader(mScriptable, reader, source.toString(), 1, null);
-        } catch (IOException e) {
-            throw new UncheckedIOException(e);
-        }
-    }
-
-    protected Reader preprocess(Reader script) throws IOException {
-        return script;
-    }
-
-    @Override
-    public void forceStop() {
-        Log.d(LOG_TAG, "forceStop: interrupt Thread: " + mThread);
-        mThread.interrupt();
-    }
-
-
-    @Override
-    public synchronized void destroy() {
-        super.destroy();
-        Log.d(LOG_TAG, "on destroy");
-        sContextEngineMap.remove(getContext());
-        Context.exit();
-    }
-
-    public Thread getThread() {
-        return mThread;
-    }
-
-    @SuppressWarnings("unchecked")
-    @Override
-    public void init() {
-        mThread = Thread.currentThread();
-        ScriptableObject.putProperty(mScriptable, "__engine__", this);
-        initRequireBuilder(mContext, mScriptable);
-        mContext.evaluateString(mScriptable, getInitScript().getScript(), SOURCE_NAME_INIT, 1, null);
-    }
-
-    private JavaScriptSource getInitScript() {
-        if (sInitScript == null || BuildConfig.DEBUG)
-            sInitScript = new StringScriptSource(readInitScript());
-        return sInitScript;
-    }
-
-    private String readInitScript() {
-        try {
-            return PFiles.read(mAndroidContext.getAssets().open("init.js"));
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    void initRequireBuilder(Context context, Scriptable scope) {
-        AssetAndUrlModuleSourceProvider provider = new AssetAndUrlModuleSourceProvider(mAndroidContext, MODULES_PATH,
-                Collections.singletonList(new File("/").toURI()));
-        new RequireBuilder()
-                .setModuleScriptProvider(new SoftCachingModuleScriptProvider(provider))
-                .setSandboxed(false)
-                .createRequire(context, scope)
-                .install(scope);
-
-    }
-
-    public Context getContext() {
-        return mContext;
-    }
-
-    public Scriptable getScriptable() {
-        return mScriptable;
-    }
-
-    protected TopLevelScope createScope(Context context) {
-        TopLevelScope topLevelScope = new TopLevelScope();
-        topLevelScope.initStandardObjects(context, false);
-        return topLevelScope;
-    }
-
-    public Context enterContext() {
-        Context context = new RhinoAndroidHelper(mAndroidContext).enterContext();
-        setupContext(context);
-        sContextEngineMap.put(context, this);
-        return context;
-    }
-
-    protected void setupContext(Context context) {
-        context.setOptimizationLevel(-1);
-        context.setLanguageVersion(Context.VERSION_ES6);
-        context.setLocale(Locale.getDefault());
-        context.setWrapFactory(new WrapFactory());
-    }
-
-
-    public static RhinoJavaScriptEngine getEngineOfContext(Context context) {
-        return sContextEngineMap.get(context);
-    }
-
-    private class WrapFactory extends org.mozilla.javascript.WrapFactory {
-
-        @Override
-        public Object wrap(Context cx, Scriptable scope, Object obj, Class<?> staticType) {
-            Object result;
-            if (obj instanceof String) {
-                result = getRuntime().bridges.toString(obj.toString());
-            } else if (staticType == UiObjectCollection.class) {
-                UiObjectCollection collection = (UiObjectCollection) obj;
-                Object[] array = new Object[collection.size()];
-                for (int i = 0; i < array.length; i++) {
-                    array[i] = wrapAsJavaObject(cx, scope, collection.get(i), UiObject.class);
-                }
-                NativeArray nativeArray = new NativeArray(array);
-                nativeArray.setPrototype(TopLevel.getBuiltinPrototype(scope, TopLevel.Builtins.Array));
-                result = new NativeArrayLikeJavaObject(scope, collection, staticType, nativeArray);
-            } else {
-                result = super.wrap(cx, scope, obj, staticType);
-            }
-            return result;
-        }
-
-        @Override
-        public Scriptable wrapAsJavaObject(Context cx, Scriptable scope, Object javaObject, Class<?> staticType) {
-            Scriptable result;
-            if (javaObject instanceof View) {
-                result = ViewExtras.getNativeView(scope, (View) javaObject, staticType, getRuntime());
-            } else {
-                result = super.wrapAsJavaObject(cx, scope, javaObject, staticType);
-            }
-            //Log.d(LOG_TAG, "wrapAsJavaObject: java = " + javaObject + ", result = " + result + ", scope = " + scope);
-            return result;
-        }
-
-    }
-
-
-}
diff --git a/autojs/src/main/java/com/stardust/autojs/engine/RhinoJavaScriptEngine.kt b/autojs/src/main/java/com/stardust/autojs/engine/RhinoJavaScriptEngine.kt
new file mode 100644
index 00000000..d2d5f25c
--- /dev/null
+++ b/autojs/src/main/java/com/stardust/autojs/engine/RhinoJavaScriptEngine.kt
@@ -0,0 +1,187 @@
+package com.stardust.autojs.engine
+
+import android.util.Log
+import android.view.View
+import com.stardust.autojs.core.ui.ViewExtras
+import com.stardust.autojs.engine.module.AssetAndUrlModuleSourceProvider
+import com.stardust.autojs.execution.ExecutionConfig
+import com.stardust.autojs.project.ScriptConfig
+import com.stardust.autojs.rhino.RhinoAndroidHelper
+import com.stardust.autojs.rhino.TopLevelScope
+import com.stardust.autojs.runtime.ScriptRuntime
+import com.stardust.autojs.script.JavaScriptSource
+import com.stardust.automator.UiObjectCollection
+import com.stardust.pio.UncheckedIOException
+import org.mozilla.javascript.Context
+import org.mozilla.javascript.Script
+import org.mozilla.javascript.Scriptable
+import org.mozilla.javascript.ScriptableObject
+import org.mozilla.javascript.commonjs.module.RequireBuilder
+import org.mozilla.javascript.commonjs.module.provider.SoftCachingModuleScriptProvider
+import java.io.File
+import java.io.IOException
+import java.io.InputStreamReader
+import java.io.Reader
+import java.net.URI
+import java.util.*
+import java.util.concurrent.ConcurrentHashMap
+
+/**
+ * Created by Stardust on 2017/4/2.
+ */
+
+open class RhinoJavaScriptEngine(private val mAndroidContext: android.content.Context) : JavaScriptEngine() {
+
+    val context: Context
+    private val mScriptable: TopLevelScope
+    lateinit var thread: Thread
+        private set
+
+    private val initScript: Script
+        get() {
+            return sInitScript ?: {
+                try {
+                    val reader = InputStreamReader(mAndroidContext.assets.open("init.js"))
+                    val script = context.compileReader(reader, SOURCE_NAME_INIT, 1, null)
+                    sInitScript = script
+                    script
+                } catch (e: IOException) {
+                    throw UncheckedIOException(e)
+                }
+            }()
+        }
+
+    val scriptable: Scriptable
+        get() = mScriptable
+
+    init {
+        this.context = enterContext()
+        mScriptable = createScope(this.context)
+    }
+
+    override fun put(name: String, value: Any?) {
+        ScriptableObject.putProperty(mScriptable, name, Context.javaToJS(value, mScriptable))
+    }
+
+    override fun setRuntime(runtime: ScriptRuntime) {
+        super.setRuntime(runtime)
+        runtime.topLevelScope = mScriptable
+    }
+
+    public override fun doExecution(source: JavaScriptSource): Any {
+        var reader = source.nonNullScriptReader
+        try {
+            reader = preprocess(reader)
+            val script = context.compileReader(reader, source.toString(), 1, null)
+            return if (hasFeature(ScriptConfig.FEATURE_CONTINUATION)) {
+                context.executeScriptWithContinuations(script, mScriptable)
+            } else {
+                script.exec(context, mScriptable)
+            }
+        } catch (e: IOException) {
+            throw UncheckedIOException(e)
+        }
+
+    }
+
+    fun hasFeature(feature: String): Boolean {
+        val config = getTag(ExecutionConfig.tag) as ExecutionConfig?
+        return config != null && config.scriptConfig.hasFeature(feature)
+    }
+
+    @Throws(IOException::class)
+    protected fun preprocess(script: Reader): Reader {
+        return script
+    }
+
+    override fun forceStop() {
+        Log.d(LOG_TAG, "forceStop: interrupt Thread: $thread")
+        thread.interrupt()
+    }
+
+
+    @Synchronized
+    override fun destroy() {
+        super.destroy()
+        Log.d(LOG_TAG, "on destroy")
+        sContextEngineMap.remove(context)
+        Context.exit()
+    }
+
+    override fun init() {
+        thread = Thread.currentThread()
+        ScriptableObject.putProperty(mScriptable, "__engine__", this)
+        initRequireBuilder(context, mScriptable)
+        context.executeScriptWithContinuations(initScript, mScriptable)
+    }
+
+    internal fun initRequireBuilder(context: Context, scope: Scriptable) {
+        val provider = AssetAndUrlModuleSourceProvider(mAndroidContext, MODULES_PATH,
+                listOf<URI>(File("/").toURI()))
+        RequireBuilder()
+                .setModuleScriptProvider(SoftCachingModuleScriptProvider(provider))
+                .setSandboxed(true)
+                .createRequire(context, scope)
+                .install(scope)
+
+    }
+
+    protected fun createScope(context: Context): TopLevelScope {
+        val topLevelScope = TopLevelScope()
+        topLevelScope.initStandardObjects(context, false)
+        return topLevelScope
+    }
+
+    fun enterContext(): Context {
+        val context = RhinoAndroidHelper(mAndroidContext).enterContext()
+        setupContext(context)
+        sContextEngineMap[context] = this
+        return context
+    }
+
+    protected fun setupContext(context: Context) {
+        context.optimizationLevel = -1
+        context.languageVersion = Context.VERSION_ES6
+        context.locale = Locale.getDefault()
+        context.wrapFactory = WrapFactory()
+    }
+
+    private inner class WrapFactory : org.mozilla.javascript.WrapFactory() {
+
+        override fun wrap(cx: Context, scope: Scriptable, obj: Any?, staticType: Class<*>?): Any? {
+            return when {
+                obj is String -> runtime.bridges.toString(obj.toString())
+                staticType == UiObjectCollection::class.java -> runtime.bridges.asArray(obj)
+                else -> super.wrap(cx, scope, obj, staticType)
+            }
+        }
+
+        override fun wrapAsJavaObject(cx: Context?, scope: Scriptable, javaObject: Any?, staticType: Class<*>?): Scriptable? {
+            //Log.d(LOG_TAG, "wrapAsJavaObject: java = " + javaObject + ", result = " + result + ", scope = " + scope);
+            return if (javaObject is View) {
+                ViewExtras.getNativeView(scope, javaObject, staticType, runtime)
+            } else {
+                super.wrapAsJavaObject(cx, scope, javaObject, staticType)
+            }
+        }
+
+    }
+
+    companion object {
+
+        val SOURCE_NAME_INIT = "<init>"
+
+        private val LOG_TAG = "RhinoJavaScriptEngine"
+
+        private val MODULES_PATH = "modules"
+        private var sInitScript: Script? = null
+        private val sContextEngineMap = ConcurrentHashMap<Context, RhinoJavaScriptEngine>()
+
+
+        fun getEngineOfContext(context: Context): RhinoJavaScriptEngine? {
+            return sContextEngineMap[context]
+        }
+    }
+
+
+}
diff --git a/autojs/src/main/java/com/stardust/autojs/engine/ScriptEngine.java b/autojs/src/main/java/com/stardust/autojs/engine/ScriptEngine.java
index dca86616..bb6c9a68 100644
--- a/autojs/src/main/java/com/stardust/autojs/engine/ScriptEngine.java
+++ b/autojs/src/main/java/com/stardust/autojs/engine/ScriptEngine.java
@@ -1,13 +1,12 @@
 package com.stardust.autojs.engine;
 
-import android.support.annotation.CallSuper;
+import androidx.annotation.CallSuper;
 
 import com.stardust.autojs.execution.ScriptExecution;
 import com.stardust.autojs.script.ScriptSource;
 
 import java.util.HashMap;
 import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicInteger;
 
 /**
@@ -26,7 +25,7 @@ public interface ScriptEngine<S extends ScriptSource> {
 
     String TAG_ENV_PATH = "env_path";
     String TAG_SOURCE = "source";
-    String TAG_EXECUTE_PATH = "execute_path";
+    String TAG_WORKING_DIRECTORY = "execute_path";
 
     void put(String name, Object value);
 
@@ -44,9 +43,9 @@ public interface ScriptEngine<S extends ScriptSource> {
 
     String cwd();
 
-    void uncaughtException(Exception throwable);
+    void uncaughtException(Throwable throwable);
 
-    Exception getUncaughtException();
+    Throwable getUncaughtException();
 
     void setId(int id);
 
@@ -72,7 +71,7 @@ public interface ScriptEngine<S extends ScriptSource> {
         private Map<String, Object> mTags = new HashMap<>();
         private OnDestroyListener mOnDestroyListener;
         private boolean mDestroyed = false;
-        private Exception mUncaughtException;
+        private Throwable mUncaughtException;
         private volatile AtomicInteger mId = new AtomicInteger(ScriptExecution.NO_ID);
 
         @Override
@@ -104,7 +103,7 @@ public interface ScriptEngine<S extends ScriptSource> {
         }
 
         public String cwd() {
-            return (String) getTag(TAG_EXECUTE_PATH);
+            return (String) getTag(TAG_WORKING_DIRECTORY);
         }
 
         public void setOnDestroyListener(OnDestroyListener onDestroyListener) {
@@ -114,13 +113,13 @@ public interface ScriptEngine<S extends ScriptSource> {
         }
 
         @Override
-        public void uncaughtException(Exception throwable) {
+        public void uncaughtException(Throwable throwable) {
             mUncaughtException = throwable;
             forceStop();
         }
 
         @Override
-        public Exception getUncaughtException() {
+        public Throwable getUncaughtException() {
             return mUncaughtException;
         }
 
diff --git a/autojs/src/main/java/com/stardust/autojs/engine/ScriptEngineFactory.java b/autojs/src/main/java/com/stardust/autojs/engine/ScriptEngineFactory.java
index 34eedf72..f374f5de 100644
--- a/autojs/src/main/java/com/stardust/autojs/engine/ScriptEngineFactory.java
+++ b/autojs/src/main/java/com/stardust/autojs/engine/ScriptEngineFactory.java
@@ -1,7 +1,7 @@
 package com.stardust.autojs.engine;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.stardust.autojs.script.ScriptSource;
 import com.stardust.util.Supplier;
diff --git a/autojs/src/main/java/com/stardust/autojs/engine/ScriptEngineManager.java b/autojs/src/main/java/com/stardust/autojs/engine/ScriptEngineManager.java
index 91507838..6b89fc9f 100644
--- a/autojs/src/main/java/com/stardust/autojs/engine/ScriptEngineManager.java
+++ b/autojs/src/main/java/com/stardust/autojs/engine/ScriptEngineManager.java
@@ -1,8 +1,8 @@
 package com.stardust.autojs.engine;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.stardust.autojs.execution.ScriptExecution;
 import com.stardust.autojs.script.ScriptSource;
diff --git a/autojs/src/main/java/com/stardust/autojs/engine/ScriptEngineProxy.java b/autojs/src/main/java/com/stardust/autojs/engine/ScriptEngineProxy.java
index 298b2323..889774d3 100644
--- a/autojs/src/main/java/com/stardust/autojs/engine/ScriptEngineProxy.java
+++ b/autojs/src/main/java/com/stardust/autojs/engine/ScriptEngineProxy.java
@@ -59,12 +59,12 @@ public class ScriptEngineProxy<S extends ScriptSource> implements ScriptEngine<S
     }
 
     @Override
-    public void uncaughtException(Exception throwable) {
+    public void uncaughtException(Throwable throwable) {
         mScriptEngine.uncaughtException(throwable);
     }
 
     @Override
-    public Exception getUncaughtException() {
+    public Throwable getUncaughtException() {
         return mScriptEngine.getUncaughtException();
     }
 
diff --git a/autojs/src/main/java/com/stardust/autojs/engine/encryption/ScriptEncryption.kt b/autojs/src/main/java/com/stardust/autojs/engine/encryption/ScriptEncryption.kt
new file mode 100644
index 00000000..46594c52
--- /dev/null
+++ b/autojs/src/main/java/com/stardust/autojs/engine/encryption/ScriptEncryption.kt
@@ -0,0 +1,14 @@
+package com.stardust.autojs.engine.encryption
+
+import com.stardust.util.AdvancedEncryptionStandard
+
+object ScriptEncryption {
+
+    private var mKey = ""
+    private var mInitVector = ""
+
+    fun decrypt(bytes: ByteArray, start: Int = 0, end: Int = bytes.size): ByteArray {
+        return AdvancedEncryptionStandard(mKey.toByteArray(), mInitVector).decrypt(bytes, start, end)
+    }
+
+}
\ No newline at end of file
diff --git a/autojs/src/main/java/com/stardust/autojs/engine/AssetAndUrlModuleSourceProvider.java b/autojs/src/main/java/com/stardust/autojs/engine/module/AssetAndUrlModuleSourceProvider.java
similarity index 63%
rename from autojs/src/main/java/com/stardust/autojs/engine/AssetAndUrlModuleSourceProvider.java
rename to autojs/src/main/java/com/stardust/autojs/engine/module/AssetAndUrlModuleSourceProvider.java
index 85ab1bfd..cc981d8b 100644
--- a/autojs/src/main/java/com/stardust/autojs/engine/AssetAndUrlModuleSourceProvider.java
+++ b/autojs/src/main/java/com/stardust/autojs/engine/module/AssetAndUrlModuleSourceProvider.java
@@ -1,20 +1,21 @@
-package com.stardust.autojs.engine;
+package com.stardust.autojs.engine.module;
 
 import android.content.res.AssetManager;
-import android.net.Uri;
 
-import org.mozilla.javascript.Scriptable;
+import com.stardust.autojs.engine.encryption.ScriptEncryption;
+import com.stardust.autojs.script.EncryptedScriptFileHeader;
+
 import org.mozilla.javascript.commonjs.module.provider.ModuleSource;
-import org.mozilla.javascript.commonjs.module.provider.UrlModuleSourceProvider;
 
-import java.io.File;
+import java.io.ByteArrayInputStream;
 import java.io.FileNotFoundException;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.io.Reader;
 import java.net.URI;
 import java.net.URISyntaxException;
-import java.util.Arrays;
-import java.util.Collections;
+import java.net.URLConnection;
 import java.util.List;
 
 /**
@@ -49,4 +50,17 @@ public class AssetAndUrlModuleSourceProvider extends UrlModuleSourceProvider {
             return super.loadFromPrivilegedLocations(moduleId, validator);
         }
     }
+
+    @Override
+    protected Reader getReader(URLConnection urlConnection) throws IOException {
+        InputStream stream = urlConnection.getInputStream();
+        byte[] bytes = new byte[stream.available()];
+        stream.read(bytes);
+        stream.close();
+        if (EncryptedScriptFileHeader.INSTANCE.isValidFile(bytes)) {
+            byte[] clearText = ScriptEncryption.INSTANCE.decrypt(bytes, EncryptedScriptFileHeader.BLOCK_SIZE, bytes.length);
+            return new InputStreamReader(new ByteArrayInputStream(clearText));
+        }
+        return new InputStreamReader(new ByteArrayInputStream(bytes));
+    }
 }
\ No newline at end of file
diff --git a/autojs/src/main/java/com/stardust/autojs/engine/module/UrlModuleSourceProvider.java b/autojs/src/main/java/com/stardust/autojs/engine/module/UrlModuleSourceProvider.java
new file mode 100644
index 00000000..c3e668df
--- /dev/null
+++ b/autojs/src/main/java/com/stardust/autojs/engine/module/UrlModuleSourceProvider.java
@@ -0,0 +1,364 @@
+package com.stardust.autojs.engine.module;
+
+import org.mozilla.javascript.commonjs.module.provider.DefaultUrlConnectionExpiryCalculator;
+import org.mozilla.javascript.commonjs.module.provider.ModuleSource;
+import org.mozilla.javascript.commonjs.module.provider.ModuleSourceProviderBase;
+import org.mozilla.javascript.commonjs.module.provider.ParsedContentType;
+import org.mozilla.javascript.commonjs.module.provider.UrlConnectionExpiryCalculator;
+import org.mozilla.javascript.commonjs.module.provider.UrlConnectionSecurityDomainProvider;
+
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.io.Serializable;
+import java.net.HttpURLConnection;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.net.URLConnection;
+import java.util.Iterator;
+import java.util.List;
+
+
+/**
+ * A URL-based script provider that can load modules against a set of base
+ * privileged and fallback URIs. It is deliberately not named "URI provider"
+ * but a "URL provider" since it actually only works against those URIs that
+ * are URLs (and the JRE has a protocol handler for them). It creates cache
+ * validators that are suitable for use with both file: and http: URL
+ * protocols. Specifically, it is able to use both last-modified timestamps and
+ * ETags for cache revalidation, and follows the HTTP cache expiry calculation
+ * model, and allows for fallback heuristic expiry calculation when no server
+ * specified expiry is provided.
+ *
+ * @author Attila Szegedi
+ * @version $Id: UrlModuleSourceProvider.java,v 1.4 2011/04/07 20:26:12 hannes%helma.at Exp $
+ */
+public class UrlModuleSourceProvider extends ModuleSourceProviderBase {
+    private static final long serialVersionUID = 1L;
+
+    private final Iterable<URI> privilegedUris;
+    private final Iterable<URI> fallbackUris;
+    private final UrlConnectionSecurityDomainProvider
+            urlConnectionSecurityDomainProvider;
+    private final UrlConnectionExpiryCalculator urlConnectionExpiryCalculator;
+
+    /**
+     * Creates a new module script provider that loads modules against a set of
+     * privileged and fallback URIs. It will use a fixed default cache expiry
+     * of 60 seconds, and provide no security domain objects for the resource.
+     *
+     * @param privilegedUris an iterable providing the privileged URIs. Can be
+     *                       null if no privileged URIs are used.
+     * @param fallbackUris   an iterable providing the fallback URIs. Can be
+     *                       null if no fallback URIs are used.
+     */
+    public UrlModuleSourceProvider(Iterable<URI> privilegedUris,
+                                   Iterable<URI> fallbackUris) {
+        this(privilegedUris, fallbackUris,
+                new DefaultUrlConnectionExpiryCalculator(), null);
+    }
+
+    /**
+     * Creates a new module script provider that loads modules against a set of
+     * privileged and fallback URIs. It will use the specified heuristic cache
+     * expiry calculator and security domain provider.
+     *
+     * @param privilegedUris                      an iterable providing the privileged URIs. Can be
+     *                                            null if no privileged URIs are used.
+     * @param fallbackUris                        an iterable providing the fallback URIs. Can be
+     *                                            null if no fallback URIs are used.
+     * @param urlConnectionExpiryCalculator       the calculator object for heuristic
+     *                                            calculation of the resource expiry, used when no expiry is provided by
+     *                                            the server of the resource. Can be null, in which case the maximum age
+     *                                            of cached entries without validation will be zero.
+     * @param urlConnectionSecurityDomainProvider object that provides security
+     *                                            domain objects for the loaded sources. Can be null, in which case the
+     *                                            loaded sources will have no security domain associated with them.
+     */
+    public UrlModuleSourceProvider(Iterable<URI> privilegedUris,
+                                   Iterable<URI> fallbackUris,
+                                   UrlConnectionExpiryCalculator urlConnectionExpiryCalculator,
+                                   UrlConnectionSecurityDomainProvider urlConnectionSecurityDomainProvider) {
+        this.privilegedUris = privilegedUris;
+        this.fallbackUris = fallbackUris;
+        this.urlConnectionExpiryCalculator = urlConnectionExpiryCalculator;
+        this.urlConnectionSecurityDomainProvider =
+                urlConnectionSecurityDomainProvider;
+    }
+
+    @Override
+    protected ModuleSource loadFromPrivilegedLocations(
+            String moduleId, Object validator)
+            throws IOException, URISyntaxException {
+        return loadFromPathList(moduleId, validator, privilegedUris);
+    }
+
+    @Override
+    protected ModuleSource loadFromFallbackLocations(
+            String moduleId, Object validator)
+            throws IOException, URISyntaxException {
+        return loadFromPathList(moduleId, validator, fallbackUris);
+    }
+
+    private ModuleSource loadFromPathList(String moduleId,
+                                          Object validator, Iterable<URI> paths)
+            throws IOException, URISyntaxException {
+        if (paths == null) {
+            return null;
+        }
+        for (URI path : paths) {
+            final ModuleSource moduleSource = loadFromUri(
+                    path.resolve(moduleId), path, validator);
+            if (moduleSource != null) {
+                return moduleSource;
+            }
+        }
+        return null;
+    }
+
+    @Override
+    protected ModuleSource loadFromUri(URI uri, URI base, Object validator)
+            throws IOException, URISyntaxException {
+        // We expect modules to have a ".js" file name extension ...
+        URI fullUri = new URI(uri + ".js");
+        ModuleSource source = loadFromActualUri(fullUri, base, validator);
+        // ... but for compatibility we support modules without extension,
+        // or ids with explicit extension.
+        return source != null ?
+                source : loadFromActualUri(uri, base, validator);
+    }
+
+    protected ModuleSource loadFromActualUri(URI uri, URI base, Object validator)
+            throws IOException {
+        final URL url = new URL(base == null ? null : base.toURL(), uri.toString());
+        final long request_time = System.currentTimeMillis();
+        final URLConnection urlConnection = openUrlConnection(url);
+        final URLValidator applicableValidator;
+        if (validator instanceof URLValidator) {
+            final URLValidator uriValidator = ((URLValidator) validator);
+            applicableValidator = uriValidator.appliesTo(uri) ? uriValidator :
+                    null;
+        } else {
+            applicableValidator = null;
+        }
+        if (applicableValidator != null) {
+            applicableValidator.applyConditionals(urlConnection);
+        }
+        try {
+            urlConnection.connect();
+            if (applicableValidator != null &&
+                    applicableValidator.updateValidator(urlConnection,
+                            request_time, urlConnectionExpiryCalculator)) {
+                close(urlConnection);
+                return NOT_MODIFIED;
+            }
+
+            return new ModuleSource(getReader(urlConnection),
+                    getSecurityDomain(urlConnection), uri, base,
+                    new URLValidator(uri, urlConnection, request_time,
+                            urlConnectionExpiryCalculator));
+        } catch (FileNotFoundException e) {
+            return null;
+        } catch (RuntimeException e) {
+            close(urlConnection);
+            throw e;
+        } catch (IOException e) {
+            close(urlConnection);
+            throw e;
+        }
+    }
+
+    protected Reader getReader(URLConnection urlConnection)
+            throws IOException {
+        return new InputStreamReader(urlConnection.getInputStream(),
+                getCharacterEncoding(urlConnection));
+    }
+
+    protected String getCharacterEncoding(URLConnection urlConnection) {
+        final ParsedContentType pct = new ParsedContentType(
+                urlConnection.getContentType());
+        final String encoding = pct.getEncoding();
+        if (encoding != null) {
+            return encoding;
+        }
+        final String contentType = pct.getContentType();
+        if (contentType != null && contentType.startsWith("text/")) {
+            return "8859_1";
+        }
+        return "utf-8";
+    }
+
+    protected Object getSecurityDomain(URLConnection urlConnection) {
+        return urlConnectionSecurityDomainProvider == null ? null :
+                urlConnectionSecurityDomainProvider.getSecurityDomain(
+                        urlConnection);
+    }
+
+    private void close(URLConnection urlConnection) {
+        try {
+            urlConnection.getInputStream().close();
+        } catch (IOException e) {
+            onFailedClosingUrlConnection(urlConnection, e);
+        }
+    }
+
+    /**
+     * Override if you want to get notified if the URL connection fails to
+     * close. Does nothing by default.
+     *
+     * @param urlConnection the connection
+     * @param cause         the cause it failed to close.
+     */
+    protected void onFailedClosingUrlConnection(URLConnection urlConnection,
+                                                IOException cause) {
+    }
+
+    /**
+     * Can be overridden in subclasses to customize the URL connection opening
+     * process. By default, just calls {@link URL#openConnection()}.
+     *
+     * @param url the URL
+     * @return a connection to the URL.
+     * @throws IOException if an I/O error occurs.
+     */
+    protected URLConnection openUrlConnection(URL url) throws IOException {
+        return url.openConnection();
+    }
+
+    @Override
+    protected boolean entityNeedsRevalidation(Object validator) {
+        return !(validator instanceof URLValidator)
+                || ((URLValidator) validator).entityNeedsRevalidation();
+    }
+
+    private static class URLValidator implements Serializable {
+        private static final long serialVersionUID = 1L;
+
+        private final URI uri;
+        private final long lastModified;
+        private final String entityTags;
+        private long expiry;
+
+        public URLValidator(URI uri, URLConnection urlConnection,
+                            long request_time, UrlConnectionExpiryCalculator
+                                    urlConnectionExpiryCalculator) {
+            this.uri = uri;
+            this.lastModified = urlConnection.getLastModified();
+            this.entityTags = getEntityTags(urlConnection);
+            expiry = calculateExpiry(urlConnection, request_time,
+                    urlConnectionExpiryCalculator);
+        }
+
+        boolean updateValidator(URLConnection urlConnection, long request_time,
+                                UrlConnectionExpiryCalculator urlConnectionExpiryCalculator)
+                throws IOException {
+            boolean isResourceChanged = isResourceChanged(urlConnection);
+            if (!isResourceChanged) {
+                expiry = calculateExpiry(urlConnection, request_time,
+                        urlConnectionExpiryCalculator);
+            }
+            return isResourceChanged;
+        }
+
+        private boolean isResourceChanged(URLConnection urlConnection)
+                throws IOException {
+            if (urlConnection instanceof HttpURLConnection) {
+                return ((HttpURLConnection) urlConnection).getResponseCode() ==
+                        HttpURLConnection.HTTP_NOT_MODIFIED;
+            }
+            return lastModified != urlConnection.getLastModified();
+        }
+
+        private long calculateExpiry(URLConnection urlConnection,
+                                     long request_time, UrlConnectionExpiryCalculator
+                                             urlConnectionExpiryCalculator) {
+            if ("no-cache".equals(urlConnection.getHeaderField("Pragma"))) {
+                return 0L;
+            }
+            final String cacheControl = urlConnection.getHeaderField(
+                    "Cache-Control");
+            if (cacheControl != null) {
+                if (cacheControl.indexOf("no-cache") != -1) {
+                    return 0L;
+                }
+                final int max_age = getMaxAge(cacheControl);
+                if (-1 != max_age) {
+                    final long response_time = System.currentTimeMillis();
+                    final long apparent_age = Math.max(0, response_time -
+                            urlConnection.getDate());
+                    final long corrected_received_age = Math.max(apparent_age,
+                            urlConnection.getHeaderFieldInt("Age", 0) * 1000L);
+                    final long response_delay = response_time - request_time;
+                    final long corrected_initial_age = corrected_received_age +
+                            response_delay;
+                    final long creation_time = response_time -
+                            corrected_initial_age;
+                    return max_age * 1000L + creation_time;
+                }
+            }
+            final long explicitExpiry = urlConnection.getHeaderFieldDate(
+                    "Expires", -1L);
+            if (explicitExpiry != -1L) {
+                return explicitExpiry;
+            }
+            return urlConnectionExpiryCalculator == null ? 0L :
+                    urlConnectionExpiryCalculator.calculateExpiry(urlConnection);
+        }
+
+        private int getMaxAge(String cacheControl) {
+            final int maxAgeIndex = cacheControl.indexOf("max-age");
+            if (maxAgeIndex == -1) {
+                return -1;
+            }
+            final int eq = cacheControl.indexOf('=', maxAgeIndex + 7);
+            if (eq == -1) {
+                return -1;
+            }
+            final int comma = cacheControl.indexOf(',', eq + 1);
+            final String strAge;
+            if (comma == -1) {
+                strAge = cacheControl.substring(eq + 1);
+            } else {
+                strAge = cacheControl.substring(eq + 1, comma);
+            }
+            try {
+                return Integer.parseInt(strAge);
+            } catch (NumberFormatException e) {
+                return -1;
+            }
+        }
+
+        private String getEntityTags(URLConnection urlConnection) {
+            final List<String> etags = urlConnection.getHeaderFields().get("ETag");
+            if (etags == null || etags.isEmpty()) {
+                return null;
+            }
+            final StringBuilder b = new StringBuilder();
+            final Iterator<String> it = etags.iterator();
+            b.append(it.next());
+            while (it.hasNext()) {
+                b.append(", ").append(it.next());
+            }
+            return b.toString();
+        }
+
+        boolean appliesTo(URI uri) {
+            return this.uri.equals(uri);
+        }
+
+        void applyConditionals(URLConnection urlConnection) {
+            if (lastModified != 0L) {
+                urlConnection.setIfModifiedSince(lastModified);
+            }
+            if (entityTags != null && entityTags.length() > 0) {
+                urlConnection.addRequestProperty("If-None-Match", entityTags);
+            }
+        }
+
+        boolean entityNeedsRevalidation() {
+            return System.currentTimeMillis() > expiry;
+        }
+    }
+}
\ No newline at end of file
diff --git a/autojs/src/main/java/com/stardust/autojs/engine/preprocess/MultiLinePreprocessor.java b/autojs/src/main/java/com/stardust/autojs/engine/preprocess/MultiLinePreprocessor.java
index c8564e93..94d18b67 100644
--- a/autojs/src/main/java/com/stardust/autojs/engine/preprocess/MultiLinePreprocessor.java
+++ b/autojs/src/main/java/com/stardust/autojs/engine/preprocess/MultiLinePreprocessor.java
@@ -1,8 +1,6 @@
 package com.stardust.autojs.engine.preprocess;
 
-import android.support.annotation.VisibleForTesting;
-
-import com.stardust.autojs.engine.preprocess.AbstractProcessor;
+import androidx.annotation.VisibleForTesting;
 
 import java.io.Reader;
 import java.io.StringReader;
diff --git a/autojs/src/main/java/com/stardust/autojs/execution/ExecutionConfig.java b/autojs/src/main/java/com/stardust/autojs/execution/ExecutionConfig.java
deleted file mode 100644
index c1f0f148..00000000
--- a/autojs/src/main/java/com/stardust/autojs/execution/ExecutionConfig.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package com.stardust.autojs.execution;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Created by Stardust on 2017/2/1.
- */
-public class ExecutionConfig implements Serializable {
-
-    public static final String TAG = "execution.config";
-    private List<String> mRequirePath = Collections.emptyList();
-    private String mExecutePath;
-    public long delay = 0;
-    public long interval = 0;
-    public int loopTimes = 1;
-    private Map<String, Object> mArguments = new HashMap<>();
-
-    public static ExecutionConfig getDefault() {
-        return new ExecutionConfig();
-    }
-
-    public boolean runInNewThread = true;
-
-    public ExecutionConfig runInNewThread(boolean runInNewThread) {
-        this.runInNewThread = runInNewThread;
-        return this;
-    }
-
-    public ExecutionConfig requirePath(String... requirePath) {
-        mRequirePath = new ArrayList<>(Arrays.asList(requirePath));
-        if (mExecutePath != null) {
-            mRequirePath.add(mExecutePath);
-        }
-        return this;
-    }
-
-    public ExecutionConfig executePath(String executePath) {
-        mExecutePath = executePath;
-        return this;
-    }
-
-    public List<String> getRequirePath() {
-        return mRequirePath;
-    }
-
-    public String getExecutePath() {
-        return mExecutePath;
-    }
-
-    public void setArgument(String key, Object object){
-        mArguments.put(key, object);
-    }
-
-    public Object getArgument(String key){
-        return mArguments.get(key);
-    }
-
-    public Map<String, Object> getArguments() {
-        return mArguments;
-    }
-
-    public ExecutionConfig loop(long delay, int loopTimes, long interval) {
-        this.delay = delay;
-        this.loopTimes = loopTimes;
-        this.interval = interval;
-        return this;
-    }
-}
diff --git a/autojs/src/main/java/com/stardust/autojs/execution/ExecutionConfig.kt b/autojs/src/main/java/com/stardust/autojs/execution/ExecutionConfig.kt
new file mode 100644
index 00000000..3044be3b
--- /dev/null
+++ b/autojs/src/main/java/com/stardust/autojs/execution/ExecutionConfig.kt
@@ -0,0 +1,99 @@
+package com.stardust.autojs.execution
+
+import android.os.Parcel
+import android.os.Parcelable
+import com.stardust.autojs.project.ScriptConfig
+import java.util.*
+
+/**
+ * Created by Stardust on 2017/2/1.
+ */
+data class ExecutionConfig(var workingDirectory: String = "",
+                           var path: Array<out String> = emptyArray(),
+                           var intentFlags: Int = 0,
+                           var delay: Long = 0,
+                           var interval: Long = 0,
+                           var loopTimes: Int = 1,
+                           var scriptConfig: ScriptConfig = ScriptConfig()) : Parcelable {
+
+
+    private val mArguments = HashMap<String, Any>()
+
+    val arguments: Map<String, Any>
+        get() = mArguments
+
+    constructor(parcel: Parcel) : this(
+            parcel.readString().orEmpty(),
+            parcel.createStringArray().orEmpty(),
+            parcel.readInt(),
+            parcel.readLong(),
+            parcel.readLong(),
+            parcel.readInt())
+
+    fun setArgument(key: String, `object`: Any) {
+        mArguments[key] = `object`
+    }
+
+    fun getArgument(key: String): Any? {
+        return mArguments[key]
+    }
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
+
+        other as ExecutionConfig
+
+        if (workingDirectory != other.workingDirectory) return false
+        if (!path.contentEquals(other.path)) return false
+        if (intentFlags != other.intentFlags) return false
+        if (delay != other.delay) return false
+        if (interval != other.interval) return false
+        if (loopTimes != other.loopTimes) return false
+        if (mArguments != other.mArguments) return false
+
+        return true
+    }
+
+    override fun hashCode(): Int {
+        var result = workingDirectory.hashCode()
+        result = 31 * result + path.contentHashCode()
+        result = 31 * result + intentFlags
+        result = 31 * result + delay.hashCode()
+        result = 31 * result + interval.hashCode()
+        result = 31 * result + loopTimes
+        result = 31 * result + mArguments.hashCode()
+        return result
+    }
+
+    override fun writeToParcel(parcel: Parcel, flags: Int) {
+        parcel.writeString(workingDirectory)
+        parcel.writeStringArray(path)
+        parcel.writeInt(intentFlags)
+        parcel.writeLong(delay)
+        parcel.writeLong(interval)
+        parcel.writeInt(loopTimes)
+    }
+
+    override fun describeContents(): Int {
+        return 0
+    }
+
+    companion object CREATOR : Parcelable.Creator<ExecutionConfig> {
+
+        @JvmStatic
+        val tag = "execution.config"
+
+        @JvmStatic
+        val default: ExecutionConfig
+            get() = ExecutionConfig()
+
+        override fun createFromParcel(parcel: Parcel): ExecutionConfig {
+            return ExecutionConfig(parcel)
+        }
+
+        override fun newArray(size: Int): Array<ExecutionConfig?> {
+            return arrayOfNulls(size)
+        }
+    }
+}
diff --git a/autojs/src/main/java/com/stardust/autojs/execution/LoopedBasedJavaScriptExecution.java b/autojs/src/main/java/com/stardust/autojs/execution/LoopedBasedJavaScriptExecution.java
index dc8f4894..db829a74 100644
--- a/autojs/src/main/java/com/stardust/autojs/execution/LoopedBasedJavaScriptExecution.java
+++ b/autojs/src/main/java/com/stardust/autojs/execution/LoopedBasedJavaScriptExecution.java
@@ -20,12 +20,12 @@ public class LoopedBasedJavaScriptExecution extends RunnableScriptExecution {
     protected Object doExecution(final ScriptEngine engine) {
         engine.setTag(ScriptEngine.TAG_SOURCE, getSource());
         getListener().onStart(this);
-        long delay = getConfig().delay;
+        long delay = getConfig().getDelay();
         sleep(delay);
         final LoopBasedJavaScriptEngine javaScriptEngine = (LoopBasedJavaScriptEngine) engine;
-        final long interval = getConfig().interval;
+        final long interval = getConfig().getInterval();
         javaScriptEngine.getRuntime().loopers.setMainLooperQuitHandler(new Loopers.LooperQuitHandler() {
-            long times = getConfig().loopTimes == 0 ? Integer.MAX_VALUE : getConfig().loopTimes;
+            long times = getConfig().getLoopTimes() == 0 ? Integer.MAX_VALUE : getConfig().getLoopTimes();
 
             @Override
             public boolean shouldQuit() {
diff --git a/autojs/src/main/java/com/stardust/autojs/execution/RunnableScriptExecution.java b/autojs/src/main/java/com/stardust/autojs/execution/RunnableScriptExecution.java
index 29863f28..6e35444e 100644
--- a/autojs/src/main/java/com/stardust/autojs/execution/RunnableScriptExecution.java
+++ b/autojs/src/main/java/com/stardust/autojs/execution/RunnableScriptExecution.java
@@ -8,13 +8,14 @@ import com.stardust.autojs.runtime.exception.ScriptInterruptedException;
 import com.stardust.autojs.script.ScriptSource;
 import com.stardust.lang.ThreadCompat;
 
+import org.mozilla.javascript.ContinuationPending;
+
 /**
  * Created by Stardust on 2017/5/1.
  */
 
 public class RunnableScriptExecution extends ScriptExecution.AbstractScriptExecution implements Runnable {
 
-
     private static final String TAG = "RunnableJSExecution";
     private ScriptEngine mScriptEngine;
     private ScriptEngineManager mScriptEngineManager;
@@ -32,7 +33,7 @@ public class RunnableScriptExecution extends ScriptExecution.AbstractScriptExecu
 
     public Object execute() {
         mScriptEngine = mScriptEngineManager.createEngineOfSourceOrThrow(getSource(), getId());
-        mScriptEngine.setTag(ExecutionConfig.TAG, getConfig());
+        mScriptEngine.setTag(ExecutionConfig.getTag(), getConfig());
         return execute(mScriptEngine);
     }
 
@@ -40,14 +41,14 @@ public class RunnableScriptExecution extends ScriptExecution.AbstractScriptExecu
         try {
             prepare(engine);
             Object r = doExecution(engine);
-            Exception uncaughtException = engine.getUncaughtException();
+            Throwable uncaughtException = engine.getUncaughtException();
             if (uncaughtException != null) {
                 onException(engine, uncaughtException);
                 return null;
             }
             getListener().onSuccess(this, r);
             return r;
-        } catch (Exception e) {
+        } catch (Throwable e) {
             onException(engine, e);
             return null;
         } finally {
@@ -56,14 +57,14 @@ public class RunnableScriptExecution extends ScriptExecution.AbstractScriptExecu
         }
     }
 
-    protected void onException(ScriptEngine engine, Exception e) {
+    protected void onException(ScriptEngine engine, Throwable e) {
         Log.w(TAG, "onException: engine = " + engine, e);
         getListener().onException(this, e);
     }
 
     private void prepare(ScriptEngine engine) {
-        engine.setTag(ScriptEngine.TAG_EXECUTE_PATH, getConfig().getExecutePath());
-        engine.setTag(ScriptEngine.TAG_ENV_PATH, getConfig().getRequirePath());
+        engine.setTag(ScriptEngine.TAG_WORKING_DIRECTORY, getConfig().getWorkingDirectory());
+        engine.setTag(ScriptEngine.TAG_ENV_PATH, getConfig().getPath());
         engine.init();
     }
 
@@ -71,12 +72,12 @@ public class RunnableScriptExecution extends ScriptExecution.AbstractScriptExecu
         engine.setTag(ScriptEngine.TAG_SOURCE, getSource());
         getListener().onStart(this);
         Object result = null;
-        long delay = getConfig().delay;
-        int times = getConfig().loopTimes;
+        long delay = getConfig().getDelay();
+        int times = getConfig().getLoopTimes();
         if (times == 0) {
             times = Integer.MAX_VALUE;
         }
-        long interval = getConfig().interval;
+        long interval = getConfig().getInterval();
         sleep(delay);
         ScriptSource source = getSource();
         for (int i = 0; i < times; i++) {
diff --git a/autojs/src/main/java/com/stardust/autojs/execution/ScriptExecuteActivity.java b/autojs/src/main/java/com/stardust/autojs/execution/ScriptExecuteActivity.java
index 99277160..b671b9ee 100644
--- a/autojs/src/main/java/com/stardust/autojs/execution/ScriptExecuteActivity.java
+++ b/autojs/src/main/java/com/stardust/autojs/execution/ScriptExecuteActivity.java
@@ -4,9 +4,9 @@ import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
+
+import androidx.appcompat.app.AppCompatActivity;
+
 import android.util.Log;
 import android.view.KeyEvent;
 import android.view.Menu;
@@ -21,10 +21,9 @@ import com.stardust.autojs.engine.LoopBasedJavaScriptEngine;
 import com.stardust.autojs.engine.ScriptEngine;
 import com.stardust.autojs.engine.ScriptEngineManager;
 import com.stardust.autojs.runtime.ScriptRuntime;
-import com.stardust.autojs.runtime.api.UI;
 import com.stardust.autojs.script.ScriptSource;
 
-import org.mozilla.javascript.NativeObject;
+import org.mozilla.javascript.ContinuationPending;
 
 /**
  * Created by Stardust on 2017/2/5.
@@ -49,7 +48,8 @@ public class ScriptExecuteActivity extends AppCompatActivity {
         ActivityScriptExecution execution = new ActivityScriptExecution(manager, task);
         Intent i = new Intent(context, ScriptExecuteActivity.class)
                 .putExtra(EXTRA_EXECUTION_ID, execution.getId())
-                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                .addFlags(task.getConfig().getIntentFlags());
         context.startActivity(i);
         return execution;
     }
@@ -86,12 +86,14 @@ public class ScriptExecuteActivity extends AppCompatActivity {
         try {
             prepare();
             doExecution();
+        } catch (ContinuationPending pending) {
+            pending.printStackTrace();
         } catch (Exception e) {
             onException(e);
         }
     }
 
-    private void onException(Exception e) {
+    private void onException(Throwable e) {
         mExecutionListener.onException(mScriptExecution, e);
         super.finish();
     }
@@ -116,8 +118,8 @@ public class ScriptExecuteActivity extends AppCompatActivity {
     private void prepare() {
         mScriptEngine.put("activity", this);
         mScriptEngine.setTag("activity", this);
-        mScriptEngine.setTag(ScriptEngine.TAG_ENV_PATH, mScriptExecution.getConfig().getRequirePath());
-        mScriptEngine.setTag(ScriptEngine.TAG_EXECUTE_PATH, mScriptExecution.getConfig().getExecutePath());
+        mScriptEngine.setTag(ScriptEngine.TAG_ENV_PATH, mScriptExecution.getConfig().getPath());
+        mScriptEngine.setTag(ScriptEngine.TAG_WORKING_DIRECTORY, mScriptExecution.getConfig().getWorkingDirectory());
         mScriptEngine.init();
     }
 
@@ -127,7 +129,7 @@ public class ScriptExecuteActivity extends AppCompatActivity {
             super.finish();
             return;
         }
-        Exception exception = mScriptEngine.getUncaughtException();
+        Throwable exception = mScriptEngine.getUncaughtException();
         if (exception != null) {
             onException(exception);
         } else {
@@ -140,7 +142,7 @@ public class ScriptExecuteActivity extends AppCompatActivity {
     protected void onDestroy() {
         super.onDestroy();
         Log.d(LOG_TAG, "onDestroy");
-        if(mScriptEngine != null){
+        if (mScriptEngine != null) {
             mScriptEngine.put("activity", null);
             mScriptEngine.setTag("activity", null);
             mScriptEngine.destroy();
@@ -246,7 +248,7 @@ public class ScriptExecuteActivity extends AppCompatActivity {
                 mScriptEngine.forceStop();
             }
             mScriptEngine = mScriptEngineManager.createEngineOfSourceOrThrow(getSource(), getId());
-            mScriptEngine.setTag(ExecutionConfig.TAG, getConfig());
+            mScriptEngine.setTag(ExecutionConfig.getTag(), getConfig());
             return mScriptEngine;
         }
 
diff --git a/autojs/src/main/java/com/stardust/autojs/execution/ScriptExecutionListener.java b/autojs/src/main/java/com/stardust/autojs/execution/ScriptExecutionListener.java
index cd10dc82..9d76cef3 100644
--- a/autojs/src/main/java/com/stardust/autojs/execution/ScriptExecutionListener.java
+++ b/autojs/src/main/java/com/stardust/autojs/execution/ScriptExecutionListener.java
@@ -12,5 +12,5 @@ public interface ScriptExecutionListener extends Serializable {
 
     void onSuccess(ScriptExecution execution, Object result);
 
-    void onException(ScriptExecution execution, Exception e);
+    void onException(ScriptExecution execution, Throwable e);
 }
diff --git a/autojs/src/main/java/com/stardust/autojs/execution/ScriptExecutionObserver.java b/autojs/src/main/java/com/stardust/autojs/execution/ScriptExecutionObserver.java
index b92ffdf9..117bc848 100644
--- a/autojs/src/main/java/com/stardust/autojs/execution/ScriptExecutionObserver.java
+++ b/autojs/src/main/java/com/stardust/autojs/execution/ScriptExecutionObserver.java
@@ -24,7 +24,7 @@ public class ScriptExecutionObserver implements ScriptExecutionListener {
     }
 
     @Override
-    public void onException(ScriptExecution execution, Exception e) {
+    public void onException(ScriptExecution execution, Throwable e) {
         for (ScriptExecutionListener listener : mScriptExecutionListeners) {
             listener.onException(execution, e);
         }
@@ -61,7 +61,7 @@ public class ScriptExecutionObserver implements ScriptExecutionListener {
         }
 
         @Override
-        public void onException(ScriptExecution execution, Exception e) {
+        public void onException(ScriptExecution execution, Throwable e) {
             mScriptExecutionListener.onException(execution, e);
             mScriptExecutionObserver.onException(execution, e);
         }
diff --git a/autojs/src/main/java/com/stardust/autojs/execution/SimpleScriptExecutionListener.java b/autojs/src/main/java/com/stardust/autojs/execution/SimpleScriptExecutionListener.java
index f38e484c..d6fe1398 100644
--- a/autojs/src/main/java/com/stardust/autojs/execution/SimpleScriptExecutionListener.java
+++ b/autojs/src/main/java/com/stardust/autojs/execution/SimpleScriptExecutionListener.java
@@ -17,7 +17,7 @@ public class SimpleScriptExecutionListener implements ScriptExecutionListener {
     }
 
     @Override
-    public void onException(ScriptExecution execution, Exception e) {
+    public void onException(ScriptExecution execution, Throwable e) {
 
     }
 }
diff --git a/autojs/src/main/java/com/stardust/autojs/project/LaunchConfig.java b/autojs/src/main/java/com/stardust/autojs/project/LaunchConfig.java
index a358368e..a10d38e8 100644
--- a/autojs/src/main/java/com/stardust/autojs/project/LaunchConfig.java
+++ b/autojs/src/main/java/com/stardust/autojs/project/LaunchConfig.java
@@ -18,4 +18,5 @@ public class LaunchConfig {
     public void setHideLogs(boolean hideLogs) {
         mHideLogs = hideLogs;
     }
+
 }
diff --git a/autojs/src/main/java/com/stardust/autojs/project/ProjectConfig.java b/autojs/src/main/java/com/stardust/autojs/project/ProjectConfig.java
index a2ac8061..0f61c122 100644
--- a/autojs/src/main/java/com/stardust/autojs/project/ProjectConfig.java
+++ b/autojs/src/main/java/com/stardust/autojs/project/ProjectConfig.java
@@ -1,20 +1,19 @@
 package com.stardust.autojs.project;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
 import android.text.TextUtils;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.annotations.SerializedName;
 import com.stardust.pio.PFiles;
-import com.stardust.pio.UncheckedIOException;
 
 import java.io.File;
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Created by Stardust on 2018/1/24.
@@ -53,31 +52,38 @@ public class ProjectConfig {
     @SerializedName("icon")
     private String mIcon;
 
+    @SerializedName("scripts")
+    private Map<String, ScriptConfig> mScriptConfigs = new HashMap<>();
+
+    @SerializedName("useFeatures")
+    private List<String> mFeatures = new ArrayList<>();
+
+
     public static ProjectConfig fromJson(String json) {
         if (json == null) {
             return null;
         }
         ProjectConfig config = GSON.fromJson(json, ProjectConfig.class);
-        if(!isValid(config)){
+        if (!isValid(config)) {
             return null;
         }
         return config;
     }
 
     private static boolean isValid(ProjectConfig config) {
-        if(TextUtils.isEmpty(config.getName())){
+        if (TextUtils.isEmpty(config.getName())) {
             return false;
         }
-        if(TextUtils.isEmpty(config.getPackageName())){
+        if (TextUtils.isEmpty(config.getPackageName())) {
             return false;
         }
-        if(TextUtils.isEmpty(config.getVersionName())){
+        if (TextUtils.isEmpty(config.getVersionName())) {
             return false;
         }
-        if(TextUtils.isEmpty(config.getMainScriptFile())){
+        if (TextUtils.isEmpty(config.getMainScriptFile())) {
             return false;
         }
-        if(config.getVersionCode() == -1){
+        if (config.getVersionCode() == -1) {
             return false;
         }
         return true;
@@ -162,6 +168,10 @@ public class ProjectConfig {
         return this;
     }
 
+    public Map<String, ScriptConfig> getScriptConfigs() {
+        return mScriptConfigs;
+    }
+
     public List<String> getAssets() {
         if (mAssets == null) {
             mAssets = Collections.emptyList();
@@ -212,4 +222,30 @@ public class ProjectConfig {
     public String getBuildDir() {
         return "build";
     }
+
+    public List<String> getFeatures() {
+        return mFeatures;
+    }
+
+    public void setFeatures(List<String> features) {
+        mFeatures = features;
+    }
+
+    public ScriptConfig getScriptConfig(String path) {
+        ScriptConfig config = mScriptConfigs.get(path);
+        if (config == null) {
+            config = new ScriptConfig();
+        }
+        if(mFeatures.isEmpty()){
+            return config;
+        }
+        ArrayList<String> features = new ArrayList<>(config.getFeatures());
+        for (String feature : mFeatures) {
+            if (!features.contains(feature)) {
+                features.add(feature);
+            }
+        }
+        config.setFeatures(features);
+        return config;
+    }
 }
diff --git a/autojs/src/main/java/com/stardust/autojs/project/ProjectLauncher.java b/autojs/src/main/java/com/stardust/autojs/project/ProjectLauncher.java
index 18e7a8dc..c8e85349 100644
--- a/autojs/src/main/java/com/stardust/autojs/project/ProjectLauncher.java
+++ b/autojs/src/main/java/com/stardust/autojs/project/ProjectLauncher.java
@@ -18,10 +18,11 @@ public class ProjectLauncher {
         mMainScriptFile = new File(mProjectDir, mProjectConfig.getMainScriptFile());
     }
 
-    public void launch(ScriptEngineService service){
-        service.execute(new JavaScriptFileSource(mMainScriptFile), new ExecutionConfig()
-                .executePath(mProjectDir)
-                .requirePath(mProjectDir));
+    public void launch(ScriptEngineService service) {
+        ExecutionConfig config = new ExecutionConfig();
+        config.setWorkingDirectory(mProjectDir);
+        config.getScriptConfig().setFeatures(mProjectConfig.getFeatures());
+        service.execute(new JavaScriptFileSource(mMainScriptFile), config);
     }
 
 }
diff --git a/autojs/src/main/java/com/stardust/autojs/project/ScriptConfig.kt b/autojs/src/main/java/com/stardust/autojs/project/ScriptConfig.kt
new file mode 100644
index 00000000..5737a34b
--- /dev/null
+++ b/autojs/src/main/java/com/stardust/autojs/project/ScriptConfig.kt
@@ -0,0 +1,18 @@
+package com.stardust.autojs.project
+
+import com.google.gson.annotations.SerializedName
+
+data class ScriptConfig(
+        @SerializedName("useFeatures") var features: List<String>,
+        @SerializedName("uiMode") var uiMode: Boolean
+) {
+    constructor() : this(emptyList(), false)
+
+    fun hasFeature(feature: String): Boolean {
+        return features.contains(feature)
+    }
+
+    companion object {
+        val FEATURE_CONTINUATION = "continuation"
+    }
+}
\ No newline at end of file
diff --git a/autojs/src/main/java/com/stardust/autojs/rhino/AndroidClassLoader.java b/autojs/src/main/java/com/stardust/autojs/rhino/AndroidClassLoader.java
index 0548a4bb..f1124e63 100644
--- a/autojs/src/main/java/com/stardust/autojs/rhino/AndroidClassLoader.java
+++ b/autojs/src/main/java/com/stardust/autojs/rhino/AndroidClassLoader.java
@@ -119,11 +119,7 @@ public class AndroidClassLoader extends ClassLoader implements GeneratedClassLoa
 
     private String generateDexFileName(File jar) {
         String message = jar.getPath() + "_" + jar.lastModified();
-        try {
-            return MD5.md5(message);
-        } catch (NoSuchAlgorithmException e) {
-            throw new RuntimeException(e);
-        }
+        return MD5.md5(message);
     }
 
     public DexClassLoader loadDex(File file) throws FileNotFoundException {
diff --git a/autojs/src/main/java/com/stardust/autojs/rhino/AutoJsContext.kt b/autojs/src/main/java/com/stardust/autojs/rhino/AutoJsContext.kt
new file mode 100644
index 00000000..cf1615c9
--- /dev/null
+++ b/autojs/src/main/java/com/stardust/autojs/rhino/AutoJsContext.kt
@@ -0,0 +1,27 @@
+package com.stardust.autojs.rhino
+
+import org.mozilla.javascript.Context
+import org.mozilla.javascript.ContextFactory
+import org.mozilla.javascript.ContinuationPending
+import org.mozilla.javascript.Scriptable
+
+class AutoJsContext(factory: ContextFactory?) : Context(factory) {
+
+    private val mContinuations = HashSet<Any>()
+
+    override fun captureContinuation(): ContinuationPending {
+        val continuationPending = super.captureContinuation()
+        mContinuations.add(continuationPending.continuation)
+        return continuationPending
+    }
+
+    override fun resumeContinuation(continuation: Any, scope: Scriptable?, functionResult: Any?): Any {
+        mContinuations.remove(continuation)
+        return super.resumeContinuation(continuation, scope, functionResult)
+    }
+
+    fun hasPendingContinuation(): Boolean {
+        return mContinuations.isNotEmpty()
+    }
+
+}
\ No newline at end of file
diff --git a/autojs/src/main/java/com/stardust/autojs/rhino/InterruptibleAndroidContextFactory.java b/autojs/src/main/java/com/stardust/autojs/rhino/InterruptibleAndroidContextFactory.java
index b3daa1e4..07fcc61b 100644
--- a/autojs/src/main/java/com/stardust/autojs/rhino/InterruptibleAndroidContextFactory.java
+++ b/autojs/src/main/java/com/stardust/autojs/rhino/InterruptibleAndroidContextFactory.java
@@ -33,7 +33,7 @@ public class InterruptibleAndroidContextFactory extends AndroidContextFactory {
 
     @Override
     protected Context makeContext() {
-        Context cx = super.makeContext();
+        Context cx = new AutoJsContext(this);
         cx.setInstructionObserverThreshold(10000);
         return cx;
     }
diff --git a/autojs/src/main/java/com/stardust/autojs/rhino/NativeArrayLikeJavaObject.java b/autojs/src/main/java/com/stardust/autojs/rhino/NativeArrayLikeJavaObject.java
deleted file mode 100644
index 30496da3..00000000
--- a/autojs/src/main/java/com/stardust/autojs/rhino/NativeArrayLikeJavaObject.java
+++ /dev/null
@@ -1,230 +0,0 @@
-package com.stardust.autojs.rhino;
-
-import android.os.Build;
-import android.support.annotation.RequiresApi;
-
-import org.mozilla.javascript.NativeArray;
-import org.mozilla.javascript.NativeJavaObject;
-import org.mozilla.javascript.Scriptable;
-
-import java.util.Collection;
-import java.util.Comparator;
-import java.util.Iterator;
-import java.util.List;
-import java.util.ListIterator;
-import java.util.Spliterator;
-import java.util.function.Consumer;
-import java.util.function.Predicate;
-import java.util.function.UnaryOperator;
-import java.util.stream.Stream;
-
-public class NativeArrayLikeJavaObject extends NativeJavaObject implements List {
-
-    private final NativeArray mArray;
-
-    public NativeArrayLikeJavaObject(Scriptable scope, Object javaObject, Class<?> staticType, NativeArray array) {
-        super(scope, javaObject, staticType);
-        mArray = array;
-        setPrototype(mArray);
-    }
-
-    public NativeArrayLikeJavaObject(Scriptable scope, Object javaObject, Class<?> staticType, boolean isAdapter, NativeArray array) {
-        super(scope, javaObject, staticType, isAdapter);
-        mArray = array;
-        setPrototype(mArray);
-    }
-
-    public NativeArrayLikeJavaObject(NativeArray array) {
-        mArray = array;
-        setPrototype(mArray);
-    }
-
-
-    @Override
-    public boolean has(int index, Scriptable start) {
-        return mArray.has(index, start);
-    }
-
-    @Override
-    public Object get(int index, Scriptable start) {
-        return mArray.get(index, start);
-    }
-
-    @Override
-    public void put(int index, Scriptable start, Object value) {
-        mArray.put(index, start, value);
-    }
-
-    @Override
-    public boolean contains(Object o) {
-        return mArray.contains(o);
-    }
-
-
-    @Override
-    public Object[] toArray() {
-        return mArray.toArray();
-    }
-
-    @Override
-    public boolean add(Object o) {
-        return mArray.add(o);
-    }
-
-    @Override
-    public Object[] toArray(Object[] a) {
-        return mArray.toArray(a);
-    }
-
-    @Override
-    public boolean containsAll(Collection c) {
-        return mArray.containsAll(c);
-    }
-
-    @Override
-    public int size() {
-        return mArray.size();
-    }
-
-    @Override
-    public boolean isEmpty() {
-        return mArray.isEmpty();
-    }
-
-    @Override
-    public Object get(int index) {
-        return mArray.get(index);
-    }
-
-    @Override
-    public int indexOf(Object o) {
-        return mArray.indexOf(o);
-    }
-
-    @Override
-    public int lastIndexOf(Object o) {
-        return mArray.lastIndexOf(o);
-    }
-
-
-    @Override
-    public Iterator iterator() {
-        return mArray.iterator();
-    }
-
-
-    @Override
-    public ListIterator listIterator() {
-        return mArray.listIterator();
-    }
-
-
-    @Override
-    public ListIterator listIterator(int start) {
-        return mArray.listIterator(start);
-    }
-
-    @Override
-    public boolean remove(Object o) {
-        return mArray.remove(o);
-    }
-
-    @Override
-    public boolean addAll(Collection c) {
-        return mArray.addAll(c);
-    }
-
-    @Override
-    public boolean addAll(int index, Collection c) {
-        return mArray.addAll(index, c);
-    }
-
-    @Override
-    public boolean removeAll(Collection c) {
-        return mArray.removeAll(c);
-    }
-
-    @Override
-    public boolean retainAll(Collection c) {
-        return mArray.retainAll(c);
-    }
-
-    @Override
-    public Object set(int index, Object element) {
-        return mArray.set(index, element);
-    }
-
-    @Override
-    public void add(int index, Object element) {
-        mArray.add(index, element);
-    }
-
-    @Override
-    public Object remove(int index) {
-        return mArray.remove(index);
-    }
-
-
-    @Override
-    public List subList(int fromIndex, int toIndex) {
-        return mArray.subList(fromIndex, toIndex);
-    }
-
-    @RequiresApi(api = Build.VERSION_CODES.N)
-    @Override
-    public void replaceAll(UnaryOperator operator) {
-        mArray.replaceAll(operator);
-    }
-
-    @RequiresApi(api = Build.VERSION_CODES.N)
-    @Override
-    public void sort(Comparator c) {
-        mArray.sort(c);
-    }
-
-    @Override
-    public void clear() {
-        mArray.clear();
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        return mArray.equals(o);
-    }
-
-    @Override
-    public int hashCode() {
-        return mArray.hashCode();
-    }
-
-
-    @RequiresApi(api = Build.VERSION_CODES.N)
-    @Override
-    public Spliterator spliterator() {
-        return mArray.spliterator();
-    }
-
-    @RequiresApi(api = Build.VERSION_CODES.N)
-    @Override
-    public boolean removeIf(Predicate filter) {
-        return mArray.removeIf(filter);
-    }
-
-    @RequiresApi(api = Build.VERSION_CODES.N)
-    @Override
-    public Stream stream() {
-        return mArray.stream();
-    }
-
-    @RequiresApi(api = Build.VERSION_CODES.N)
-    @Override
-    public Stream parallelStream() {
-        return mArray.parallelStream();
-    }
-
-    @RequiresApi(api = Build.VERSION_CODES.N)
-    @Override
-    public void forEach(Consumer action) {
-        mArray.forEach(action);
-    }
-}
diff --git a/autojs/src/main/java/com/stardust/autojs/rhino/RhinoAndroidHelper.java b/autojs/src/main/java/com/stardust/autojs/rhino/RhinoAndroidHelper.java
index c56c0d08..b3ec0809 100644
--- a/autojs/src/main/java/com/stardust/autojs/rhino/RhinoAndroidHelper.java
+++ b/autojs/src/main/java/com/stardust/autojs/rhino/RhinoAndroidHelper.java
@@ -1,6 +1,6 @@
 package com.stardust.autojs.rhino;
 
-import android.support.annotation.VisibleForTesting;
+import androidx.annotation.VisibleForTesting;
 
 
 import org.mozilla.javascript.Context;
diff --git a/autojs/src/main/java/com/stardust/autojs/rhino/continuation/Continuation.kt b/autojs/src/main/java/com/stardust/autojs/rhino/continuation/Continuation.kt
new file mode 100644
index 00000000..8520711b
--- /dev/null
+++ b/autojs/src/main/java/com/stardust/autojs/rhino/continuation/Continuation.kt
@@ -0,0 +1,59 @@
+package com.stardust.autojs.rhino.continuation
+
+import com.stardust.autojs.core.looper.Timer
+import com.stardust.autojs.core.looper.TimerThread
+import com.stardust.autojs.rhino.AutoJsContext
+import com.stardust.autojs.runtime.ScriptRuntime
+
+import org.mozilla.javascript.Context
+import org.mozilla.javascript.ContinuationPending
+import org.mozilla.javascript.Scriptable
+
+class Continuation(val context: AutoJsContext, val scope: Scriptable, private val mTimer: Timer) {
+    var pending: ContinuationPending? = null
+        private set
+    private val mThread: Thread = Thread.currentThread()
+
+    class Result(val result: Any?, val error: Any?) {
+        companion object {
+
+            fun success(result: Any?): Result {
+                return Result(result, null)
+            }
+
+            fun failure(error: Any?): Result {
+                return Result(null, error)
+            }
+        }
+    }
+
+    fun suspend() {
+        if (pending != null) {
+            throw IllegalStateException("call suspend twice!")
+        }
+        context.captureContinuation().let {
+            pending = it
+            throw it
+        }
+    }
+
+    fun resumeWith(result: Result) {
+        val continuation = pending?.continuation
+                ?: throw IllegalStateException("call resume() without suspend()!")
+        if (mThread == Thread.currentThread()) {
+            context.resumeContinuation(continuation, scope, result)
+        } else {
+            mTimer.postDelayed({
+                context.resumeContinuation(continuation, scope, result)
+            }, 0)
+        }
+    }
+
+    companion object {
+
+        fun create(runtime: ScriptRuntime, scope: Scriptable): Continuation {
+            val context = Context.getCurrentContext() as AutoJsContext
+            return Continuation(context, scope, runtime.timers.timerForCurrentThread)
+        }
+    }
+}
diff --git a/autojs/src/main/java/com/stardust/autojs/rhino/debug/Debugger.java b/autojs/src/main/java/com/stardust/autojs/rhino/debug/Debugger.java
index 05d3dcae..32b39bd4 100644
--- a/autojs/src/main/java/com/stardust/autojs/rhino/debug/Debugger.java
+++ b/autojs/src/main/java/com/stardust/autojs/rhino/debug/Debugger.java
@@ -2,7 +2,7 @@ package com.stardust.autojs.rhino.debug;
 
 import android.os.Handler;
 import android.os.Looper;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.util.Log;
 
 import com.stardust.autojs.ScriptEngineService;
diff --git a/autojs/src/main/java/com/stardust/autojs/runtime/ScriptBridges.java b/autojs/src/main/java/com/stardust/autojs/runtime/ScriptBridges.java
index d27b8dc4..c567d8b0 100644
--- a/autojs/src/main/java/com/stardust/autojs/runtime/ScriptBridges.java
+++ b/autojs/src/main/java/com/stardust/autojs/runtime/ScriptBridges.java
@@ -17,6 +17,7 @@ public class ScriptBridges {
 
         Object toString(Object obj);
 
+        Object asArray(Object obj);
     }
 
     private Bridges mBridges;
@@ -46,4 +47,8 @@ public class ScriptBridges {
         return mBridges.toString(obj);
     }
 
+    public Object asArray(Object obj) {
+        checkBridges();
+        return mBridges.asArray(obj);
+    }
 }
diff --git a/autojs/src/main/java/com/stardust/autojs/runtime/ScriptRuntime.java b/autojs/src/main/java/com/stardust/autojs/runtime/ScriptRuntime.java
index 57cb8029..93a7b3c9 100644
--- a/autojs/src/main/java/com/stardust/autojs/runtime/ScriptRuntime.java
+++ b/autojs/src/main/java/com/stardust/autojs/runtime/ScriptRuntime.java
@@ -1,7 +1,5 @@
 package com.stardust.autojs.runtime;
 
-import android.Manifest;
-import android.app.Activity;
 import android.content.Context;
 import android.os.Build;
 import android.os.Looper;
@@ -13,9 +11,10 @@ import com.stardust.autojs.ScriptEngineService;
 import com.stardust.autojs.annotation.ScriptVariable;
 import com.stardust.autojs.core.accessibility.AccessibilityBridge;
 import com.stardust.autojs.core.image.Colors;
-import com.stardust.autojs.core.permission.PermissionRequestProxyActivity;
 import com.stardust.autojs.core.permission.Permissions;
 import com.stardust.autojs.rhino.AndroidClassLoader;
+import com.stardust.autojs.rhino.TopLevelScope;
+import com.stardust.autojs.rhino.continuation.Continuation;
 import com.stardust.autojs.runtime.api.AbstractShell;
 import com.stardust.autojs.runtime.api.AppUtils;
 import com.stardust.autojs.runtime.api.Console;
@@ -26,6 +25,7 @@ import com.stardust.autojs.runtime.api.Files;
 import com.stardust.autojs.runtime.api.Floaty;
 import com.stardust.autojs.core.looper.Loopers;
 import com.stardust.autojs.runtime.api.Media;
+import com.stardust.autojs.runtime.api.Plugins;
 import com.stardust.autojs.runtime.api.Sensors;
 import com.stardust.autojs.runtime.api.Threads;
 import com.stardust.autojs.runtime.api.Timers;
@@ -52,6 +52,7 @@ import com.stardust.view.accessibility.AccessibilityInfoProvider;
 import org.mozilla.javascript.ContextFactory;
 import org.mozilla.javascript.RhinoException;
 import org.mozilla.javascript.ScriptStackElement;
+import org.mozilla.javascript.Scriptable;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -60,13 +61,9 @@ import java.io.PrintWriter;
 import java.io.StringReader;
 import java.io.StringWriter;
 import java.lang.ref.WeakReference;
-import java.util.ArrayList;
-import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-import static android.content.pm.PackageManager.PERMISSION_DENIED;
-
 
 /**
  * Created by Stardust on 2017/1/27.
@@ -193,6 +190,9 @@ public class ScriptRuntime {
     @ScriptVariable
     public final Media media;
 
+    @ScriptVariable
+    public final Plugins plugins;
+
     private Images images;
 
     private static WeakReference<Context> applicationContext;
@@ -201,6 +201,7 @@ public class ScriptRuntime {
     private Supplier<AbstractShell> mShellSupplier;
     private ScreenMetrics mScreenMetrics = new ScreenMetrics();
     private Thread mThread;
+    private TopLevelScope mTopLevelScope;
 
 
     protected ScriptRuntime(Builder builder) {
@@ -223,6 +224,7 @@ public class ScriptRuntime {
         floaty = new Floaty(uiHandler, ui, this);
         files = new Files(this);
         media = new Media(context, this);
+        plugins = new Plugins(context, this);
     }
 
     public void init() {
@@ -236,6 +238,17 @@ public class ScriptRuntime {
         sensors = new Sensors(uiHandler.getContext(), this);
     }
 
+    public TopLevelScope getTopLevelScope() {
+        return mTopLevelScope;
+    }
+
+    public void setTopLevelScope(TopLevelScope topLevelScope) {
+        if (mTopLevelScope != null) {
+            throw new IllegalStateException("top level has already exists");
+        }
+        mTopLevelScope = topLevelScope;
+    }
+
     public static void setApplicationContext(Context context) {
         applicationContext = new WeakReference<>(context);
     }
@@ -358,7 +371,7 @@ public class ScriptRuntime {
         }
     }
 
-    public void exit(Exception e) {
+    public void exit(Throwable e) {
         engines.myEngine().uncaughtException(e);
         exit();
     }
@@ -389,8 +402,8 @@ public class ScriptRuntime {
         ignoresException(floaty::closeAll);
         try {
             events.emit("exit");
-        } catch (Exception ignored) {
-            console.error("exception on exit: ", ignored);
+        } catch (Throwable e) {
+            console.error("exception on exit: ", e);
         }
         ignoresException(threads::shutDownAll);
         ignoresException(events::recycle);
@@ -412,7 +425,7 @@ public class ScriptRuntime {
     private void ignoresException(Runnable r) {
         try {
             r.run();
-        } catch (Exception e) {
+        } catch (Throwable e) {
             e.printStackTrace();
         }
     }
@@ -433,8 +446,18 @@ public class ScriptRuntime {
         return mProperties.remove(key);
     }
 
+    public Continuation createContinuation() {
+        return Continuation.Companion.create(this, mTopLevelScope);
+    }
+
+    public Continuation createContinuation(Scriptable scope) {
+        return Continuation.Companion.create(this, scope);
+    }
+
+
     public static String getStackTrace(Throwable e, boolean printJavaStackTrace) {
-        StringBuilder scriptTrace = new StringBuilder();
+        String message = e.getMessage();
+        StringBuilder scriptTrace = new StringBuilder(message == null ? "" : message + "\n");
         if (e instanceof RhinoException) {
             RhinoException rhinoException = (RhinoException) e;
             scriptTrace.append(rhinoException.details()).append("\n");
@@ -461,7 +484,7 @@ public class ScriptRuntime {
             return scriptTrace.toString();
         } catch (IOException e1) {
             e1.printStackTrace();
-            return e.getMessage();
+            return message;
         }
     }
 
diff --git a/autojs/src/main/java/com/stardust/autojs/runtime/api/AbstractConsole.java b/autojs/src/main/java/com/stardust/autojs/runtime/api/AbstractConsole.java
index 40a764b8..7ef7bb9e 100644
--- a/autojs/src/main/java/com/stardust/autojs/runtime/api/AbstractConsole.java
+++ b/autojs/src/main/java/com/stardust/autojs/runtime/api/AbstractConsole.java
@@ -1,12 +1,10 @@
 package com.stardust.autojs.runtime.api;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.util.Log;
 
 import com.stardust.autojs.runtime.exception.ScriptException;
 
-import java.util.Formatter;
-
 /**
  * Created by Stardust on 2017/5/1.
  */
diff --git a/autojs/src/main/java/com/stardust/autojs/runtime/api/AppUtils.java b/autojs/src/main/java/com/stardust/autojs/runtime/api/AppUtils.java
index 2a5d3a75..b8c82982 100644
--- a/autojs/src/main/java/com/stardust/autojs/runtime/api/AppUtils.java
+++ b/autojs/src/main/java/com/stardust/autojs/runtime/api/AppUtils.java
@@ -6,13 +6,13 @@ import android.content.Intent;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
 import android.net.Uri;
-import android.support.annotation.Nullable;
-import android.support.v4.content.LocalBroadcastManager;
+import androidx.annotation.Nullable;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
+
 import android.util.Log;
 
 import com.stardust.autojs.annotation.ScriptInterface;
 import com.stardust.util.IntentUtil;
-import com.stardust.util.MimeTypes;
 
 import java.lang.ref.WeakReference;
 import java.util.List;
@@ -51,7 +51,7 @@ public class AppUtils {
     }
 
     @ScriptInterface
-    public void sendLocalBroadcastSync(Intent intent){
+    public void sendLocalBroadcastSync(Intent intent) {
         LocalBroadcastManager.getInstance(mContext).sendBroadcastSync(intent);
     }
 
@@ -92,6 +92,11 @@ public class AppUtils {
         return IntentUtil.goToAppDetailSettings(mContext, packageName);
     }
 
+    @ScriptInterface
+    public String getFileProviderAuthority() {
+        return mFileProviderAuthority;
+    }
+
     @Nullable
     public Activity getCurrentActivity() {
         Log.d("App", "getCurrentActivity: " + mCurrentActivity.get());
diff --git a/autojs/src/main/java/com/stardust/autojs/runtime/api/Console.java b/autojs/src/main/java/com/stardust/autojs/runtime/api/Console.java
index c876f595..bce8a902 100644
--- a/autojs/src/main/java/com/stardust/autojs/runtime/api/Console.java
+++ b/autojs/src/main/java/com/stardust/autojs/runtime/api/Console.java
@@ -1,6 +1,6 @@
 package com.stardust.autojs.runtime.api;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import com.stardust.autojs.annotation.ScriptInterface;
 
@@ -43,4 +43,5 @@ public interface Console {
     String println(int level, CharSequence charSequence);
 
     void setTitle(CharSequence title);
+
 }
diff --git a/autojs/src/main/java/com/stardust/autojs/runtime/api/Device.java b/autojs/src/main/java/com/stardust/autojs/runtime/api/Device.java
index 5d9e58d9..bf2608f4 100644
--- a/autojs/src/main/java/com/stardust/autojs/runtime/api/Device.java
+++ b/autojs/src/main/java/com/stardust/autojs/runtime/api/Device.java
@@ -15,11 +15,9 @@ import android.os.Build;
 import android.os.PowerManager;
 import android.os.Vibrator;
 import android.provider.Settings;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.telephony.TelephonyManager;
-import android.view.Display;
-import android.view.WindowManager;
 
 import com.stardust.autojs.R;
 import com.stardust.autojs.runtime.exception.ScriptException;
diff --git a/autojs/src/main/java/com/stardust/autojs/runtime/api/Dialogs.java b/autojs/src/main/java/com/stardust/autojs/runtime/api/Dialogs.java
index ccc68af8..14425ba1 100644
--- a/autojs/src/main/java/com/stardust/autojs/runtime/api/Dialogs.java
+++ b/autojs/src/main/java/com/stardust/autojs/runtime/api/Dialogs.java
@@ -42,7 +42,6 @@ public class Dialogs {
                 .showAndGet();
     }
 
-
     @ScriptInterface
     public Object alert(String title, String content, Object callback) {
         MaterialDialog.Builder builder = dialogBuilder(callback)
@@ -66,7 +65,7 @@ public class Dialogs {
             builder.content(content);
         }
         return ((BlockedMaterialDialog.Builder) builder).showAndGet();
-    }
+}
 
     private Context getContext() {
         if (mThemeWrapper != null)
@@ -120,13 +119,20 @@ public class Dialogs {
                 .showAndGet();
     }
 
+    @ScriptInterface
+    public Object selectFile(String title, String prefill, Object callback) {
+        return ((BlockedMaterialDialog.Builder) dialogBuilder(callback)
+                .input(null, prefill, true)
+                .title(title))
+                .showAndGet();
+    }
 
     private BlockedMaterialDialog.Builder dialogBuilder(Object callback) {
         Context context = mRuntime.app.getCurrentActivity();
         if (context == null || ((Activity) context).isFinishing()) {
             context = getContext();
         }
-        return (BlockedMaterialDialog.Builder) new BlockedMaterialDialog.Builder(context, mRuntime.uiHandler, mRuntime.bridges, callback)
+        return (BlockedMaterialDialog.Builder) new BlockedMaterialDialog.Builder(context, mRuntime, callback)
                 .theme(Theme.LIGHT);
     }
 
diff --git a/autojs/src/main/java/com/stardust/autojs/runtime/api/Events.java b/autojs/src/main/java/com/stardust/autojs/runtime/api/Events.java
index 4a8027ba..ff0fbc91 100644
--- a/autojs/src/main/java/com/stardust/autojs/runtime/api/Events.java
+++ b/autojs/src/main/java/com/stardust/autojs/runtime/api/Events.java
@@ -7,12 +7,13 @@ import android.graphics.Point;
 import android.os.Build;
 import android.os.Handler;
 import android.provider.Settings;
-import android.support.annotation.RequiresApi;
+
+import androidx.annotation.RequiresApi;
+
 import android.view.KeyEvent;
 
 import com.stardust.autojs.R;
 import com.stardust.autojs.core.accessibility.AccessibilityBridge;
-import com.stardust.autojs.core.boardcast.Broadcast;
 import com.stardust.autojs.core.boardcast.BroadcastEmitter;
 import com.stardust.autojs.core.eventloop.EventEmitter;
 import com.stardust.autojs.core.looper.Loopers;
@@ -24,6 +25,7 @@ import com.stardust.notification.NotificationListenerService;
 import com.stardust.autojs.runtime.exception.ScriptException;
 import com.stardust.autojs.core.inputevent.InputEventObserver;
 import com.stardust.autojs.core.inputevent.TouchObserver;
+import com.stardust.util.MapBuilder;
 import com.stardust.view.accessibility.AccessibilityNotificationObserver;
 import com.stardust.view.accessibility.AccessibilityService;
 import com.stardust.view.accessibility.KeyInterceptor;
@@ -31,16 +33,35 @@ import com.stardust.view.accessibility.NotificationListener;
 import com.stardust.view.accessibility.OnKeyListener;
 
 import java.util.HashSet;
+import java.util.Map;
 import java.util.Set;
 
 /**
  * Created by Stardust on 2017/7/18.
  */
 
-public class Events extends EventEmitter implements OnKeyListener, TouchObserver.OnTouchEventListener, NotificationListener, AccessibilityNotificationObserver.ToastListener {
+public class Events extends EventEmitter implements OnKeyListener, TouchObserver.OnTouchEventListener, NotificationListener, AccessibilityNotificationObserver.ToastListener, AccessibilityService.GestureListener {
 
     private static final String PREFIX_KEY_DOWN = "__key_down__#";
     private static final String PREFIX_KEY_UP = "__key_up__#";
+    private static final Map<Integer, String> GESTURES = new MapBuilder<Integer, String>()
+            .put(AccessibilityService.GESTURE_SWIPE_UP, "up")
+            .put(AccessibilityService.GESTURE_SWIPE_DOWN, "down")
+            .put(AccessibilityService.GESTURE_SWIPE_LEFT, "left")
+            .put(AccessibilityService.GESTURE_SWIPE_RIGHT, "right")
+            .put(AccessibilityService.GESTURE_SWIPE_LEFT_AND_RIGHT, "left_right")
+            .put(AccessibilityService.GESTURE_SWIPE_RIGHT_AND_LEFT, "right_left")
+            .put(AccessibilityService.GESTURE_SWIPE_UP_AND_DOWN, "up_down")
+            .put(AccessibilityService.GESTURE_SWIPE_DOWN_AND_UP, "down_up")
+            .put(AccessibilityService.GESTURE_SWIPE_LEFT_AND_UP, "left_up")
+            .put(AccessibilityService.GESTURE_SWIPE_LEFT_AND_DOWN, "left_down")
+            .put(AccessibilityService.GESTURE_SWIPE_RIGHT_AND_UP, "right_up")
+            .put(AccessibilityService.GESTURE_SWIPE_RIGHT_AND_DOWN, "right_down")
+            .put(AccessibilityService.GESTURE_SWIPE_UP_AND_LEFT, "up_left")
+            .put(AccessibilityService.GESTURE_SWIPE_UP_AND_RIGHT, "up_right")
+            .put(AccessibilityService.GESTURE_SWIPE_DOWN_AND_LEFT, "down_left")
+            .put(AccessibilityService.GESTURE_SWIPE_DOWN_AND_RIGHT, "down_right")
+            .build();
 
     private AccessibilityBridge mAccessibilityBridge;
     private Context mContext;
@@ -51,6 +72,7 @@ public class Events extends EventEmitter implements OnKeyListener, TouchObserver
     private Loopers mLoopers;
     private Handler mHandler;
     private boolean mListeningNotification = false;
+    private boolean mListeningGesture = false;
     private boolean mListeningToast = false;
     private ScriptRuntime mScriptRuntime;
     private volatile boolean mInterceptsAllKey = false;
@@ -204,13 +226,13 @@ public class Events extends EventEmitter implements OnKeyListener, TouchObserver
         mListeningNotification = true;
         ensureHandler();
         mLoopers.waitWhenIdle(true);
-        if (NotificationListenerService.getInstance() == null) {
+        if (NotificationListenerService.Companion.getInstance() == null) {
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP_MR1) {
                 mContext.startActivity(new Intent(Settings.ACTION_NOTIFICATION_LISTENER_SETTINGS));
             }
             throw new ScriptException(mContext.getString(R.string.exception_notification_service_disabled));
         }
-        NotificationListenerService.getInstance().addListener(this);
+        NotificationListenerService.Companion.getInstance().addListener(this);
     }
 
     public void observeToast() {
@@ -223,6 +245,21 @@ public class Events extends EventEmitter implements OnKeyListener, TouchObserver
         mAccessibilityBridge.getNotificationObserver().addToastListener(this);
     }
 
+    public void observeGesture() {
+        ScriptRuntime.requiresApi(Build.VERSION_CODES.O);
+        if (mListeningGesture) {
+            return;
+        }
+        AccessibilityService service = getAccessibilityService();
+        if ((service.getServiceInfo().flags & AccessibilityServiceInfo.FLAG_REQUEST_TOUCH_EXPLORATION_MODE) == 0) {
+            throw new ScriptException(mContext.getString(R.string.text_should_enable_gesture_observing));
+        }
+        service.getGestureEventDispatcher().addListener(this);
+        ensureHandler();
+        mLoopers.waitWhenIdle(true);
+        mListeningGesture = true;
+    }
+
     public Events onNotification(Object listener) {
         on("notification", listener);
         return this;
@@ -250,8 +287,8 @@ public class Events extends EventEmitter implements OnKeyListener, TouchObserver
             mAccessibilityBridge.getNotificationObserver().removeNotificationListener(this);
             mAccessibilityBridge.getNotificationObserver().removeToastListener(this);
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2
-                    && NotificationListenerService.getInstance() != null) {
-                NotificationListenerService.getInstance().removeListener(this);
+                    && NotificationListenerService.Companion.getInstance() != null) {
+                NotificationListenerService.Companion.getInstance().removeListener(this);
             }
         }
         if (mKeyInterceptor != null) {
@@ -261,6 +298,12 @@ public class Events extends EventEmitter implements OnKeyListener, TouchObserver
             }
             mKeyInterceptor = null;
         }
+        if (mListeningGesture) {
+            AccessibilityService service = mAccessibilityBridge.getService();
+            if (service != null) {
+                service.getGestureEventDispatcher().removeListener(this);
+            }
+        }
     }
 
     @Override
@@ -298,4 +341,13 @@ public class Events extends EventEmitter implements OnKeyListener, TouchObserver
         mHandler.post(() -> emit("toast", toast));
     }
 
+    @Override
+    public void onGesture(int gestureId) {
+        mHandler.post(() -> {
+            String gesture = GESTURES.get(gestureId);
+            if (gesture != null) {
+                emit("gesture", gesture);
+            }
+        });
+    }
 }
diff --git a/autojs/src/main/java/com/stardust/autojs/runtime/api/Floaty.java b/autojs/src/main/java/com/stardust/autojs/runtime/api/Floaty.java
index 28e77b54..ecaa6ef1 100644
--- a/autojs/src/main/java/com/stardust/autojs/runtime/api/Floaty.java
+++ b/autojs/src/main/java/com/stardust/autojs/runtime/api/Floaty.java
@@ -36,7 +36,7 @@ public class Floaty {
     public Floaty(UiHandler uiHandler, UI ui, ScriptRuntime runtime) {
         mUiHandler = uiHandler;
         mRuntime = runtime;
-        mContext = new ContextThemeWrapper(mUiHandler.getContext(), R.style.AppTheme);
+        mContext = new ContextThemeWrapper(mUiHandler.getContext(), R.style.ScriptTheme);
         mLayoutInflater = ui.getLayoutInflater();
     }
 
diff --git a/autojs/src/main/java/com/stardust/autojs/runtime/api/Images.java b/autojs/src/main/java/com/stardust/autojs/runtime/api/Images.java
index c97e7318..711a6038 100644
--- a/autojs/src/main/java/com/stardust/autojs/runtime/api/Images.java
+++ b/autojs/src/main/java/com/stardust/autojs/runtime/api/Images.java
@@ -2,35 +2,36 @@ package com.stardust.autojs.runtime.api;
 
 import android.app.Activity;
 import android.content.Context;
-import android.content.res.Configuration;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
+import android.graphics.Canvas;
 import android.graphics.Matrix;
+import android.graphics.Paint;
 import android.media.Image;
 import android.os.Build;
 import android.os.Handler;
-import android.support.annotation.RequiresApi;
+import android.os.Looper;
+
+import androidx.annotation.RequiresApi;
+
 import android.util.Base64;
-import android.view.Display;
-import android.view.Surface;
-import android.view.WindowManager;
-import android.widget.ListView;
+import android.view.Gravity;
 
 import com.stardust.autojs.annotation.ScriptVariable;
 import com.stardust.autojs.core.image.ColorFinder;
 import com.stardust.autojs.core.image.ImageWrapper;
-import com.stardust.autojs.core.image.OpenCVHelper;
+import com.stardust.autojs.core.image.TemplateMatching;
 import com.stardust.autojs.core.image.capture.ScreenCaptureRequester;
 import com.stardust.autojs.core.image.capture.ScreenCapturer;
-import com.stardust.autojs.core.image.TemplateMatching;
+import com.stardust.autojs.core.opencv.Mat;
+import com.stardust.autojs.core.opencv.OpenCVHelper;
 import com.stardust.autojs.core.ui.inflater.util.Drawables;
+import com.stardust.autojs.core.util.ScriptPromiseAdapter;
 import com.stardust.autojs.runtime.ScriptRuntime;
-import com.stardust.autojs.runtime.exception.ScriptInterruptedException;
 import com.stardust.concurrent.VolatileDispose;
 import com.stardust.pio.UncheckedIOException;
 import com.stardust.util.ScreenMetrics;
 
-import org.opencv.core.Mat;
 import org.opencv.core.Point;
 import org.opencv.core.Rect;
 
@@ -41,6 +42,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.net.HttpURLConnection;
 import java.net.URL;
+import java.util.Arrays;
 
 /**
  * Created by Stardust on 2017/5/20.
@@ -52,10 +54,10 @@ public class Images {
     private ScreenCaptureRequester mScreenCaptureRequester;
     private ScreenCapturer mScreenCapturer;
     private Context mContext;
-    private Display mDisplay;
     private Image mPreCapture;
     private ImageWrapper mPreCaptureImage;
     private ScreenMetrics mScreenMetrics;
+    private volatile boolean mOpenCvInitialized = false;
 
     @ScriptVariable
     public final ColorFinder colorFinder;
@@ -64,44 +66,35 @@ public class Images {
         mScriptRuntime = scriptRuntime;
         mScreenCaptureRequester = screenCaptureRequester;
         mContext = context;
-        mDisplay = ((WindowManager) context.getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay();
         mScreenMetrics = mScriptRuntime.getScreenMetrics();
         colorFinder = new ColorFinder(mScreenMetrics);
     }
 
     @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
-    public boolean requestScreenCapture(int orientation) {
+    public ScriptPromiseAdapter requestScreenCapture(int orientation) {
         ScriptRuntime.requiresApi(21);
+        ScriptPromiseAdapter promiseAdapter = new ScriptPromiseAdapter();
         if (mScreenCapturer != null) {
             mScreenCapturer.setOrientation(orientation);
-            return true;
+            promiseAdapter.resolve(true);
+            return promiseAdapter;
         }
-        final VolatileDispose<Boolean> requestResult = new VolatileDispose<>();
+        Looper servantLooper = mScriptRuntime.loopers.getServantLooper();
         mScreenCaptureRequester.setOnActivityResultCallback((result, data) -> {
             if (result == Activity.RESULT_OK) {
                 mScreenCapturer = new ScreenCapturer(mContext, data, orientation, ScreenMetrics.getDeviceScreenDensity(),
-                        new Handler(mScriptRuntime.loopers.getServantLooper()));
-                requestResult.setAndNotify(true);
+                        new Handler(servantLooper));
+                promiseAdapter.resolve(true);
             } else {
-                requestResult.setAndNotify(false);
+                promiseAdapter.resolve(false);
             }
         });
         mScreenCaptureRequester.request();
-        return requestResult.blockedGetOrThrow(ScriptInterruptedException.class);
+        return promiseAdapter;
     }
 
     @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
-    public boolean requestScreenCapture(boolean landscape) {
-        return requestScreenCapture(landscape ? Configuration.ORIENTATION_LANDSCAPE : Configuration.ORIENTATION_PORTRAIT);
-    }
-
-    @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
-    public boolean requestScreenCapture() {
-        return requestScreenCapture(ScreenCapturer.ORIENTATION_AUTO);
-    }
-
-    @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
-    public ImageWrapper captureScreen() {
+    public synchronized ImageWrapper captureScreen() {
         ScriptRuntime.requiresApi(21);
         if (mScreenCapturer == null) {
             throw new SecurityException("No screen capture permission");
@@ -130,14 +123,7 @@ public class Images {
     }
 
     public ImageWrapper copy(ImageWrapper image) {
-        image.ensureNotRecycled();
-        if (image.getBitmap() == null) {
-            return new ImageWrapper(image.getMat().clone());
-        }
-        if (image.getMat() == null) {
-            return new ImageWrapper(image.getBitmap().copy(image.getBitmap().getConfig(), true));
-        }
-        return new ImageWrapper(image.getBitmap().copy(image.getBitmap().getConfig(), true), image.getMat().clone());
+        return image.clone();
     }
 
     public boolean save(ImageWrapper image, String path, String format, int quality) throws IOException {
@@ -156,6 +142,43 @@ public class Images {
         return image.pixel(x, y);
     }
 
+    public static ImageWrapper concat(ImageWrapper img1, Rect rect1, ImageWrapper img2, Rect rect2, int direction) {
+        if (!Arrays.asList(Gravity.LEFT, Gravity.RIGHT, Gravity.TOP, Gravity.BOTTOM).contains(direction)) {
+            throw new IllegalArgumentException("unknown direction " + direction);
+        }
+        int width;
+        int height;
+        if (direction == Gravity.LEFT || direction == Gravity.TOP) {
+            ImageWrapper tmp = img1;
+            img1 = img2;
+            img2 = tmp;
+        }
+        if (direction == Gravity.LEFT || direction == Gravity.RIGHT) {
+            width = rect1.width + rect2.width;
+            height = Math.max(rect1.height, rect2.height);
+        } else {
+            width = Math.max(rect1.width, rect2.height);
+            height = rect1.height + rect2.height;
+        }
+        Bitmap bitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
+        Canvas canvas = new Canvas(bitmap);
+        Paint paint = new Paint();
+        if (direction == Gravity.LEFT || direction == Gravity.RIGHT) {
+            canvas.drawBitmap(img1.getBitmap(), 0, (height - rect1.height) / 2, paint);
+            canvas.drawBitmap(img2.getBitmap(), rect1.width, (height - rect2.height) / 2, paint);
+        } else {
+            canvas.drawBitmap(img1.getBitmap(), (width - rect1.width) / 2, 0, paint);
+            canvas.drawBitmap(img2.getBitmap(), (width - rect2.width) / 2, rect1.height, paint);
+        }
+        return ImageWrapper.ofBitmap(bitmap);
+    }
+
+    public ImageWrapper rotate(ImageWrapper img, float x, float y, float degree) {
+        Matrix matrix = new Matrix();
+        matrix.postRotate(degree, x, y);
+        return ImageWrapper.ofBitmap(Bitmap.createBitmap(img.getBitmap(), 0, 0, img.getWidth(), img.getHeight(), matrix, true));
+    }
+
     public ImageWrapper clip(ImageWrapper img, int x, int y, int w, int h) {
         return ImageWrapper.ofBitmap(Bitmap.createBitmap(img.getBitmap(), x, y, w, h));
     }
@@ -255,6 +278,7 @@ public class Images {
     }
 
     public Point findImage(ImageWrapper image, ImageWrapper template, float weakThreshold, float threshold, Rect rect, int maxLevel) {
+        initOpenCvIfNeeded();
         if (image == null)
             throw new NullPointerException("image = null");
         if (template == null)
@@ -279,5 +303,35 @@ public class Images {
         return point;
     }
 
+    public Mat newMat() {
+        return new Mat();
+    }
 
+    public Mat newMat(Mat mat, Rect roi) {
+        return new Mat(mat, roi);
+    }
+
+    public void initOpenCvIfNeeded() {
+        if (mOpenCvInitialized || OpenCVHelper.isInitialized()) {
+            return;
+        }
+        Activity currentActivity = mScriptRuntime.app.getCurrentActivity();
+        Context context = currentActivity == null ? mContext : currentActivity;
+        mScriptRuntime.console.info("opencv initializing");
+        if (Looper.myLooper() == Looper.getMainLooper()) {
+            OpenCVHelper.initIfNeeded(context, () -> {
+                mOpenCvInitialized = true;
+                mScriptRuntime.console.info("opencv initialized");
+            });
+        } else {
+            VolatileDispose<Boolean> result = new VolatileDispose<>();
+            OpenCVHelper.initIfNeeded(context, () -> {
+                mOpenCvInitialized = true;
+                result.setAndNotify(true);
+                mScriptRuntime.console.info("opencv initialized");
+            });
+            result.blockedGet();
+        }
+
+    }
 }
diff --git a/autojs/src/main/java/com/stardust/autojs/runtime/api/Plugins.java b/autojs/src/main/java/com/stardust/autojs/runtime/api/Plugins.java
new file mode 100644
index 00000000..d0ac77ca
--- /dev/null
+++ b/autojs/src/main/java/com/stardust/autojs/runtime/api/Plugins.java
@@ -0,0 +1,49 @@
+package com.stardust.autojs.runtime.api;
+
+import android.content.Context;
+
+import com.stardust.autojs.core.plugin.Plugin;
+import com.stardust.autojs.runtime.ScriptRuntime;
+import com.stardust.pio.PFiles;
+
+import java.io.File;
+
+public class Plugins {
+
+    private final Context mContext;
+    private final ScriptRuntime mRuntime;
+    private File mPluginCacheDir;
+
+    public Plugins(Context context, ScriptRuntime runtime) {
+        mContext = context;
+        mRuntime = runtime;
+        mPluginCacheDir = new File(mContext.getCacheDir(), "plugin-scripts/");
+    }
+
+    public Plugin load(String packageName) {
+        try {
+            Context packageContext = mContext.createPackageContext(packageName, Context.CONTEXT_INCLUDE_CODE | Context.CONTEXT_IGNORE_SECURITY);
+            Plugin plugin = Plugin.load(mContext, packageContext, mRuntime, mRuntime.getTopLevelScope());
+            if (plugin == null) {
+                return null;
+            }
+            File scriptCacheDir = getScriptCacheDir(packageName);
+            PFiles.copyAssetDir(packageContext.getAssets(), plugin.getAssetsScriptDir(), scriptCacheDir.getPath(), null);
+            plugin.setMainScriptPath(new File(scriptCacheDir, "index.js").getPath());
+            return plugin;
+        } catch (Exception e) {
+            throw new Plugin.PluginLoadException(e);
+        }
+    }
+
+    private File getScriptCacheDir(String packageName) {
+        File dir = new File(mPluginCacheDir, packageName + "/");
+        dir.mkdirs();
+        return dir;
+    }
+
+    public void clear() {
+        PFiles.deleteRecursively(mPluginCacheDir);
+    }
+
+}
diff --git a/autojs/src/main/java/com/stardust/autojs/runtime/api/Sensors.java b/autojs/src/main/java/com/stardust/autojs/runtime/api/Sensors.java
index e011e6f4..f8075300 100644
--- a/autojs/src/main/java/com/stardust/autojs/runtime/api/Sensors.java
+++ b/autojs/src/main/java/com/stardust/autojs/runtime/api/Sensors.java
@@ -5,7 +5,7 @@ import android.hardware.Sensor;
 import android.hardware.SensorEvent;
 import android.hardware.SensorEventListener;
 import android.hardware.SensorManager;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.stardust.autojs.core.eventloop.EventEmitter;
 import com.stardust.autojs.core.looper.Loopers;
diff --git a/autojs/src/main/java/com/stardust/autojs/runtime/api/Threads.java b/autojs/src/main/java/com/stardust/autojs/runtime/api/Threads.java
index 4b58d07a..23a04d54 100644
--- a/autojs/src/main/java/com/stardust/autojs/runtime/api/Threads.java
+++ b/autojs/src/main/java/com/stardust/autojs/runtime/api/Threads.java
@@ -1,6 +1,6 @@
 package com.stardust.autojs.runtime.api;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.stardust.autojs.core.looper.MainThreadProxy;
 import com.stardust.autojs.core.looper.TimerThread;
diff --git a/autojs/src/main/java/com/stardust/autojs/runtime/api/Timers.java b/autojs/src/main/java/com/stardust/autojs/runtime/api/Timers.java
index 7c67e38f..233fafad 100644
--- a/autojs/src/main/java/com/stardust/autojs/runtime/api/Timers.java
+++ b/autojs/src/main/java/com/stardust/autojs/runtime/api/Timers.java
@@ -81,14 +81,14 @@ public class Timers {
 
     public boolean hasPendingCallbacks() {
         //如果是脚本主线程，则检查所有子线程中的定时回调。mFutureCallbackUptimeMillis用来记录所有子线程中定时最久的一个。
-        // if (mThreads.getMainThread() == Thread.currentThread()) {
-        //   return mMaxCallbackUptimeMillisForAllThreads.get() > SystemClock.uptimeMillis();
-        //}
-        //否则检查当前线程的定时回调
+        if (mThreads.getMainThread() == Thread.currentThread()) {
+            return mMaxCallbackUptimeMillisForAllThreads.get() > SystemClock.uptimeMillis();
+        }
+        // 否则检查当前线程的定时回调
         return getTimerForCurrentThread().hasPendingCallbacks();
     }
 
-    public void recycle(){
+    public void recycle() {
         mMainTimer.removeAllCallbacks();
     }
 
diff --git a/autojs/src/main/java/com/stardust/autojs/runtime/api/UI.java b/autojs/src/main/java/com/stardust/autojs/runtime/api/UI.java
index 53e3b4ee..be8f6f01 100644
--- a/autojs/src/main/java/com/stardust/autojs/runtime/api/UI.java
+++ b/autojs/src/main/java/com/stardust/autojs/runtime/api/UI.java
@@ -2,8 +2,7 @@ package com.stardust.autojs.runtime.api;
 
 import android.content.Context;
 import android.graphics.drawable.Drawable;
-import android.support.annotation.Nullable;
-import android.view.View;
+import androidx.annotation.Nullable;
 
 import com.stardust.autojs.core.graphics.ScriptCanvasView;
 import com.stardust.autojs.core.ui.inflater.DynamicLayoutInflater;
@@ -18,9 +17,7 @@ import com.stardust.autojs.core.ui.widget.JsListView;
 import com.stardust.autojs.rhino.ProxyObject;
 import com.stardust.autojs.runtime.ScriptRuntime;
 
-import org.mozilla.javascript.NativeObject;
 import org.mozilla.javascript.Scriptable;
-import org.mozilla.javascript.UniqueTag;
 
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
diff --git a/autojs/src/main/java/com/stardust/autojs/script/EncryptedScriptFileHeader.kt b/autojs/src/main/java/com/stardust/autojs/script/EncryptedScriptFileHeader.kt
new file mode 100644
index 00000000..fe8948e9
--- /dev/null
+++ b/autojs/src/main/java/com/stardust/autojs/script/EncryptedScriptFileHeader.kt
@@ -0,0 +1,47 @@
+package com.stardust.autojs.script
+
+import java.io.File
+import java.io.FileInputStream
+import java.io.OutputStream
+
+object EncryptedScriptFileHeader {
+
+    const val FLAG_INVALID_FILE: Short = Short.MIN_VALUE
+
+    const val FLAG_EXECUTION_MODE_UI: Short = 0x0001
+    const val FLAG_EXECUTION_MODE_AUTO: Short = 0x0002
+
+    const val BLOCK_SIZE = 8
+    private val BLOCK = byteArrayOf(0x77, 0x01, 0x17, 0x7F, 0x12, 0x12)
+
+    fun getHeaderFlags(file: File): Short {
+        val fis = FileInputStream(file)
+        val bytes = ByteArray(BLOCK_SIZE)
+        if (fis.read(bytes) < BLOCK_SIZE) {
+            return FLAG_INVALID_FILE
+        }
+        if (!isValidFile(bytes)) {
+            return FLAG_INVALID_FILE
+        }
+        return (bytes[BLOCK.size].toShort() * 256 + bytes[BLOCK.size + 1]).toShort()
+    }
+
+    fun isValidFile(bytes: ByteArray): Boolean {
+        for (i in 0 until BLOCK.size) {
+            if (bytes[i] != BLOCK[i]) {
+                return false
+            }
+        }
+        return true
+    }
+
+    fun writeHeader(os: OutputStream, flags: Short = 0) {
+        os.write(BLOCK)
+        val byte6 = flags / 256
+        val byte7 = flags % 256
+        os.write(byte6)
+        os.write(byte7)
+    }
+
+
+}
\ No newline at end of file
diff --git a/autojs/src/main/java/com/stardust/autojs/script/JavaScriptFileSource.java b/autojs/src/main/java/com/stardust/autojs/script/JavaScriptFileSource.java
index 9459a131..6b9f6924 100644
--- a/autojs/src/main/java/com/stardust/autojs/script/JavaScriptFileSource.java
+++ b/autojs/src/main/java/com/stardust/autojs/script/JavaScriptFileSource.java
@@ -1,6 +1,6 @@
 package com.stardust.autojs.script;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.stardust.pio.PFiles;
 import com.stardust.pio.UncheckedIOException;
@@ -43,6 +43,15 @@ public class JavaScriptFileSource extends JavaScriptSource {
         return mScript;
     }
 
+    @Override
+    protected int parseExecutionMode() {
+        short flags = EncryptedScriptFileHeader.INSTANCE.getHeaderFlags(mFile);
+        if (flags == EncryptedScriptFileHeader.FLAG_INVALID_FILE) {
+            return super.parseExecutionMode();
+        }
+        return flags;
+    }
+
     @Override
     public Reader getScriptReader() {
         try {
diff --git a/autojs/src/main/java/com/stardust/autojs/script/JavaScriptSource.java b/autojs/src/main/java/com/stardust/autojs/script/JavaScriptSource.java
index 665ad06e..9089f0d5 100644
--- a/autojs/src/main/java/com/stardust/autojs/script/JavaScriptSource.java
+++ b/autojs/src/main/java/com/stardust/autojs/script/JavaScriptSource.java
@@ -1,7 +1,9 @@
 package com.stardust.autojs.script;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import android.util.Log;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.stardust.autojs.rhino.TokenStream;
 import com.stardust.util.MapBuilder;
@@ -26,11 +28,13 @@ public abstract class JavaScriptSource extends ScriptSource {
     public static final int EXECUTION_MODE_UI = 0x00000001;
     public static final int EXECUTION_MODE_AUTO = 0x00000002;
 
+    private static final String LOG_TAG = "JavaScriptSource";
+
     private static final Map<String, Integer> EXECUTION_MODES = new MapBuilder<String, Integer>()
             .put("ui", EXECUTION_MODE_UI)
             .put("auto", EXECUTION_MODE_AUTO)
             .build();
-    private static final int EXECUTION_MODE_STRING_MAX_LENGTH = 7;
+    private static final int PARSING_MAX_TOKEN = 300;
 
     private int mExecutionMode = -1;
 
@@ -60,20 +64,35 @@ public abstract class JavaScriptSource extends ScriptSource {
 
     public int getExecutionMode() {
         if (mExecutionMode == -1) {
-            mExecutionMode = parseExecutionMode(getScript());
+            mExecutionMode = parseExecutionMode();
         }
         return mExecutionMode;
     }
 
-    private int parseExecutionMode(String script) {
-        if (script == null || script.length() == 0)
-            return EXECUTION_MODE_NORMAL;
-        if(script.charAt(0) == '"'){
-            int i = script.lastIndexOf("\";", EXECUTION_MODE_STRING_MAX_LENGTH + 2);
-            if (i >= 0){
-                String modeString = script.substring(1, i);
-                return parseExecutionMode(modeString.split(" "));
+    protected int parseExecutionMode() {
+        String script = getScript();
+        TokenStream ts = new TokenStream(new StringReader(script), null, 1);
+        int token;
+        int count = 0;
+        try {
+            while (count <= PARSING_MAX_TOKEN && (token = ts.getToken()) != Token.EOF) {
+                count++;
+                if (token == Token.EOL || token == Token.COMMENT) {
+                    continue;
+                }
+                if (token == Token.STRING && ts.getTokenLength() > 2) {
+                    String tokenString = script.substring(ts.getTokenBeg() + 1, ts.getTokenEnd() - 1);
+                    if (ts.getToken() != Token.SEMI) {
+                        break;
+                    }
+                    Log.d(LOG_TAG, "string = " + tokenString);
+                    return parseExecutionMode(tokenString.split(" "));
+                }
+                break;
             }
+        } catch (Exception e) {
+            e.printStackTrace();
+            return EXECUTION_MODE_NORMAL;
         }
         return EXECUTION_MODE_NORMAL;
 
diff --git a/autojs/src/main/java/com/stardust/autojs/script/JsBeautifier.java b/autojs/src/main/java/com/stardust/autojs/script/JsBeautifier.java
index 5b114468..c5b90a7e 100644
--- a/autojs/src/main/java/com/stardust/autojs/script/JsBeautifier.java
+++ b/autojs/src/main/java/com/stardust/autojs/script/JsBeautifier.java
@@ -1,10 +1,9 @@
 package com.stardust.autojs.script;
 
 import android.content.Context;
-import android.util.Log;
 import android.view.View;
 
-import com.stardust.autojs.engine.AssetAndUrlModuleSourceProvider;
+import com.stardust.autojs.engine.module.AssetAndUrlModuleSourceProvider;
 import com.stardust.pio.PFiles;
 import com.stardust.pio.UncheckedIOException;
 
@@ -18,7 +17,6 @@ import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Collections;
-import java.util.concurrent.Executor;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
diff --git a/autojs/src/main/java/com/stardust/autojs/script/SequenceScriptSource.java b/autojs/src/main/java/com/stardust/autojs/script/SequenceScriptSource.java
index fa37db35..f555d0bf 100644
--- a/autojs/src/main/java/com/stardust/autojs/script/SequenceScriptSource.java
+++ b/autojs/src/main/java/com/stardust/autojs/script/SequenceScriptSource.java
@@ -1,7 +1,7 @@
 package com.stardust.autojs.script;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.stardust.io.ConcatReader;
 
diff --git a/autojs/src/main/java/com/stardust/autojs/script/StringScriptSource.java b/autojs/src/main/java/com/stardust/autojs/script/StringScriptSource.java
index c8b672d5..f8b55778 100644
--- a/autojs/src/main/java/com/stardust/autojs/script/StringScriptSource.java
+++ b/autojs/src/main/java/com/stardust/autojs/script/StringScriptSource.java
@@ -1,7 +1,7 @@
 package com.stardust.autojs.script;
 
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import java.io.Reader;
 
diff --git a/autojs/src/main/java/com/stardust/autojs/util/FloatingPermission.java b/autojs/src/main/java/com/stardust/autojs/util/FloatingPermission.java
index d2626d6f..c4a4a33f 100644
--- a/autojs/src/main/java/com/stardust/autojs/util/FloatingPermission.java
+++ b/autojs/src/main/java/com/stardust/autojs/util/FloatingPermission.java
@@ -7,11 +7,11 @@ import android.os.Build;
 import android.os.Handler;
 import android.os.Looper;
 import android.provider.Settings;
-import android.support.annotation.RequiresApi;
+import androidx.annotation.RequiresApi;
 import android.text.TextUtils;
 import android.widget.Toast;
 
-import com.stardust.R;
+import com.stardust.autojs.R;
 import com.stardust.enhancedfloaty.util.FloatingWindowPermissionUtil;
 
 import java.lang.reflect.Method;
diff --git a/autojs/src/main/java/com/stardust/autojs/workground/WrapContentLinearLayoutManager.java b/autojs/src/main/java/com/stardust/autojs/workground/WrapContentLinearLayoutManager.java
index ffd19b4c..02bed10e 100644
--- a/autojs/src/main/java/com/stardust/autojs/workground/WrapContentLinearLayoutManager.java
+++ b/autojs/src/main/java/com/stardust/autojs/workground/WrapContentLinearLayoutManager.java
@@ -1,11 +1,12 @@
 package com.stardust.autojs.workground;
 
 import android.content.Context;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
 import android.util.AttributeSet;
 import android.util.Log;
 
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
 /**
  * Created by Stardust on 2017/2/13.
  * http://stackoverflow.com/questions/31759171/recyclerview-and-java-lang-indexoutofboundsexception-inconsistency-detected-in
diff --git a/autojs/src/main/java/org/mozilla/javascript/VMBridge_custom.java b/autojs/src/main/java/org/mozilla/javascript/VMBridge_custom.java
index bcd69bc0..bcb67541 100644
--- a/autojs/src/main/java/org/mozilla/javascript/VMBridge_custom.java
+++ b/autojs/src/main/java/org/mozilla/javascript/VMBridge_custom.java
@@ -23,7 +23,7 @@ public class VMBridge_custom extends VMBridge_jdk15 {
     protected Object newInterfaceProxy(Object proxyHelper, ContextFactory cf, InterfaceAdapter adapter, Object target, Scriptable topScope) {
         Context context = Context.getCurrentContext();
         InterfaceAdapterWrapper adapterWrapper = new InterfaceAdapterWrapper(adapter, context);
-        RhinoJavaScriptEngine engine = RhinoJavaScriptEngine.getEngineOfContext(context);
+        RhinoJavaScriptEngine engine = RhinoJavaScriptEngine.Companion.getEngineOfContext(context);
         // --- The following code is copied from super class --
         Constructor<?> c = (Constructor) proxyHelper;
         InvocationHandler handler = (proxy, method, args) -> {
@@ -50,7 +50,9 @@ public class VMBridge_custom extends VMBridge_jdk15 {
                 try {
                     Object result = adapterWrapper.invoke(cf, target, topScope, proxy, method, args);
                     return castReturnValue(method, result);
-                } catch (Exception e) {
+                } catch (ContinuationPending pending) {
+                    return defaultValue(method.getReturnType());
+                } catch (Throwable e) {
                     e.printStackTrace();
                     // notify the script thread to exit
                     com.stardust.autojs.runtime.ScriptRuntime runtime = engine.getRuntime();
@@ -143,6 +145,7 @@ public class VMBridge_custom extends VMBridge_jdk15 {
 
 
         public Object invokeImpl(Context cx, Object target, Scriptable topScope, Object thisObject, Method method, Object[] args) {
+            cx.isContinuationsTopCall = true;
             return mInterfaceAdapter.invokeImpl(cx, target, topScope, thisObject, method, args);
         }
     }
diff --git a/autojs/src/main/res/layout/console_view.xml b/autojs/src/main/res/layout/console_view.xml
index 1b497f74..9eb69f96 100644
--- a/autojs/src/main/res/layout/console_view.xml
+++ b/autojs/src/main/res/layout/console_view.xml
@@ -6,7 +6,7 @@
               android:animateLayoutChanges="true"
               android:orientation="vertical">
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/log_list"
         android:layout_width="match_parent"
         android:layout_height="0dp"
diff --git a/autojs/src/main/res/layout/floaty_window.xml b/autojs/src/main/res/layout/floaty_window.xml
index b28440bf..ff1f18e0 100644
--- a/autojs/src/main/res/layout/floaty_window.xml
+++ b/autojs/src/main/res/layout/floaty_window.xml
@@ -9,7 +9,7 @@
         android:id="@+id/container"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_margin="12dp">
+        android:layout_margin="@dimen/floaty_window_offset">
 
     </FrameLayout>
 
diff --git a/autojs/src/main/res/layout/js_appbar.xml b/autojs/src/main/res/layout/js_appbar.xml
index 3756a8aa..f06aa064 100644
--- a/autojs/src/main/res/layout/js_appbar.xml
+++ b/autojs/src/main/res/layout/js_appbar.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.AppBarLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<com.google.android.material.appbar.AppBarLayout xmlns:android="http://schemas.android.com/apk/res/android"
                                             xmlns:app="http://schemas.android.com/apk/res-auto"
                                             android:layout_width="match_parent"
                                             android:layout_height="wrap_content"
-                                            android:theme="@style/AppTheme.AppBarOverlay"
-                                            app:popupTheme="@style/AppTheme.PopupOverlay">
+                                            android:theme="@style/ScriptTheme.AppBarOverlay"
+                                            app:popupTheme="@style/ScriptTheme.PopupOverlay">
 
-</android.support.design.widget.AppBarLayout>
\ No newline at end of file
+</com.google.android.material.appbar.AppBarLayout>
\ No newline at end of file
diff --git a/autojs/src/main/res/values-en/strings.xml b/autojs/src/main/res/values-en/strings.xml
index aa24ef65..f57a76fd 100644
--- a/autojs/src/main/res/values-en/strings.xml
+++ b/autojs/src/main/res/values-en/strings.xml
@@ -1,5 +1,5 @@
 <resources>
-    <string name="app_name">AutoJs</string>
+    <string name="app_name">Auto.js</string>
     <string name="text_error">Error:</string>
     <string name="text_start_running">Script Running</string>
     <string name="text_path_is_empty">Path is empty</string>
@@ -13,7 +13,6 @@
     <string name="text_console">Console</string>
     <string name="text_no_floating_window_permission">No drawing overlay permission</string>
     <string name="text_accessibility_service_description">Auto.js</string>
-    <string name="_app_name">AutoJs</string>
     <string name="text_should_enable_key_observing">Key observing is disabled, please enable in settings</string>
     <string name="no_write_settings_permissin">No writing settings permission</string>
     <string name="exception_notification_service_disabled">通知服务未运行，请重新启用通知权限</string>
diff --git a/autojs/src/main/res/values/attrs.xml b/autojs/src/main/res/values/attrs.xml
new file mode 100644
index 00000000..4a4610cd
--- /dev/null
+++ b/autojs/src/main/res/values/attrs.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <declare-styleable name="ConsoleView">
+        <attr name="color_debug" format="reference|color"/>
+        <attr name="color_verbose" format="reference|color"/>
+        <attr name="color_info" format="reference|color"/>
+        <attr name="color_warn" format="reference|color"/>
+        <attr name="color_error" format="reference|color"/>
+        <attr name="color_assert" format="reference|color"/>
+    </declare-styleable>
+</resources>
\ No newline at end of file
diff --git a/autojs/src/main/res/values/dimens.xml b/autojs/src/main/res/values/dimens.xml
new file mode 100644
index 00000000..531a26fe
--- /dev/null
+++ b/autojs/src/main/res/values/dimens.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="floaty_window_offset">12dp</dimen>
+</resources>
\ No newline at end of file
diff --git a/autojs/src/main/res/values/strings.xml b/autojs/src/main/res/values/strings.xml
index a2ce0e93..e5f862ca 100644
--- a/autojs/src/main/res/values/strings.xml
+++ b/autojs/src/main/res/values/strings.xml
@@ -1,5 +1,5 @@
 <resources>
-    <string name="app_name">AutoJs</string>
+    <string name="app_name">Auto.js</string>
     <string name="text_error">错误:</string>
     <string name="text_start_running">开始运行</string>
     <string name="text_path_is_empty">路径为空</string>
@@ -13,8 +13,8 @@
     <string name="text_console">控制台</string>
     <string name="text_no_floating_window_permission">没有悬浮窗权限</string>
     <string name="text_accessibility_service_description">使脚本自动操作(点击、长按、滑动等)所需，若关闭则只能执行不涉及自动操作的脚本。</string>
-    <string name="_app_name">AutoJs</string>
     <string name="text_should_enable_key_observing">按键监听未启用，请在软件设置中开启</string>
+    <string name="text_should_enable_gesture_observing">手势监听未启用，请在软件设置中开启</string>
     <string name="no_write_settings_permissin">沒有修改系統设置权限</string>
     <string name="exception_notification_service_disabled">通知服务未运行，请重新启用通知权限</string>
     <string name="text_requires_app_version_to_run_the_script" formatted="true">本脚本需要Auto.js版本号%d以上才能运行</string>
diff --git a/autojs/src/main/res/values/styles.xml b/autojs/src/main/res/values/styles.xml
index 2de1c41d..868d1de9 100644
--- a/autojs/src/main/res/values/styles.xml
+++ b/autojs/src/main/res/values/styles.xml
@@ -6,19 +6,19 @@
         <item name="colorButtonNormal">#cc181818</item>
     </style>
 
-    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
+    <style name="ScriptTheme" parent="Theme.AppCompat.Light.NoActionBar">
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</item>
-        <item name="android:popupTheme" tools:ignore="NewApi">@style/AppTheme.PopupOverlay</item>
+        <item name="android:popupTheme" tools:ignore="NewApi">@style/ScriptTheme.PopupOverlay</item>
     </style>
 
-    <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar"/>
+    <style name="ScriptTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar"/>
 
-    <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar"/>
+    <style name="ScriptTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar"/>
 
 
-    <style name="AppTheme.Transparent" parent="AppTheme">
+    <style name="ScriptTheme.Transparent" parent="ScriptTheme">
         <item name="android:windowIsTranslucent">true</item>
         <item name="android:windowBackground">@android:color/transparent</item>
         <item name="android:windowContentOverlay">@null</item>
diff --git a/automator/build.gradle b/automator/build.gradle
index 91363f60..bbc0f88f 100644
--- a/automator/build.gradle
+++ b/automator/build.gradle
@@ -1,4 +1,6 @@
 apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-android-extensions'
 
 android {
     compileSdkVersion versions.compile
@@ -10,7 +12,7 @@ android {
         versionCode 1
         versionName "1.0"
 
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
     }
     compileOptions {
@@ -33,10 +35,10 @@ repositories {
 }
 
 dependencies {
-    androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
+    androidTestImplementation('androidx.test.espresso:espresso-core:3.1.1-alpha01', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
     testImplementation 'junit:junit:4.12'
-    api 'com.android.support:appcompat-v7:28.0.0'
+    api 'androidx.appcompat:appcompat:1.0.2'
     api project(path: ':common')
 }
diff --git a/automator/src/androidTest/java/com/stardust/automator/ExampleInstrumentedTest.java b/automator/src/androidTest/java/com/stardust/automator/ExampleInstrumentedTest.java
deleted file mode 100644
index bf26d3b7..00000000
--- a/automator/src/androidTest/java/com/stardust/automator/ExampleInstrumentedTest.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.stardust.automator;
-
-import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static org.junit.Assert.*;
-
-/**
- * Instrumentation test, which will execute on an Android device.
- *
- * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
- */
-@RunWith(AndroidJUnit4.class)
-public class ExampleInstrumentedTest {
-    @Test
-    public void useAppContext() throws Exception {
-        // Context of the app under test.
-        Context appContext = InstrumentationRegistry.getTargetContext();
-
-        assertEquals("com.stardust.automator.test", appContext.getPackageName());
-    }
-}
diff --git a/automator/src/androidTest/java/com/stardust/automator/ExampleInstrumentedTest.kt b/automator/src/androidTest/java/com/stardust/automator/ExampleInstrumentedTest.kt
new file mode 100644
index 00000000..eb1fb438
--- /dev/null
+++ b/automator/src/androidTest/java/com/stardust/automator/ExampleInstrumentedTest.kt
@@ -0,0 +1,27 @@
+package com.stardust.automator
+
+import android.content.Context
+import android.support.test.InstrumentationRegistry
+import android.support.test.runner.AndroidJUnit4
+
+import org.junit.Test
+import org.junit.runner.RunWith
+
+import org.junit.Assert.*
+
+/**
+ * Instrumentation test, which will execute on an Android device.
+ *
+ * @see [Testing documentation](http://d.android.com/tools/testing)
+ */
+@RunWith(AndroidJUnit4::class)
+class ExampleInstrumentedTest {
+    @Test
+    @Throws(Exception::class)
+    fun useAppContext() {
+        // Context of the app under test.
+        val appContext = InstrumentationRegistry.getTargetContext()
+
+        assertEquals("com.stardust.automator.test", appContext.packageName)
+    }
+}
diff --git a/automator/src/androidTest/java/com/stardust/automator/simple_action/DepthFirstSearchTargetActionTest.java b/automator/src/androidTest/java/com/stardust/automator/simple_action/DepthFirstSearchTargetActionTest.java
deleted file mode 100644
index fb5ff52f..00000000
--- a/automator/src/androidTest/java/com/stardust/automator/simple_action/DepthFirstSearchTargetActionTest.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.stardust.automator.simple_action;
-
-import android.view.accessibility.AccessibilityNodeInfo;
-
-import com.stardust.automator.UiObject;
-import com.stardust.automator.test.TestUiObject;
-
-import org.junit.Test;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import static org.junit.Assert.*;
-
-/**
- * Created by Stardust on 2017/5/5.
- */
-public class DepthFirstSearchTargetActionTest {
-
-    @Test
-    public void perform() {
-        DepthFirstSearchTargetAction action = new DepthFirstSearchTargetAction(AccessibilityNodeInfo.ACTION_CLICK, new FilterAction.Filter() {
-            @Override
-            public List<UiObject> filter(UiObject root) {
-                List<UiObject> list = new ArrayList<>();
-                for (int i = 0; i < root.getChildCount(); i++) {
-                    list.add(root.child(i));
-                }
-                return list;
-            }
-        });
-        TestUiObject root = new TestUiObject(5);
-        action.perform(root);
-        System.out.println(TestUiObject.max);
-        assertEquals(1, TestUiObject.count);
-    }
-
-}
\ No newline at end of file
diff --git a/automator/src/androidTest/java/com/stardust/automator/simple_action/DepthFirstSearchTargetActionTest.kt b/automator/src/androidTest/java/com/stardust/automator/simple_action/DepthFirstSearchTargetActionTest.kt
new file mode 100644
index 00000000..323e86d6
--- /dev/null
+++ b/automator/src/androidTest/java/com/stardust/automator/simple_action/DepthFirstSearchTargetActionTest.kt
@@ -0,0 +1,34 @@
+package com.stardust.automator.simple_action
+
+import android.view.accessibility.AccessibilityNodeInfo
+
+import com.stardust.automator.UiObject
+import com.stardust.automator.test.TestUiObject
+
+import org.junit.Test
+
+import java.util.ArrayList
+
+import org.junit.Assert.*
+
+/**
+ * Created by Stardust on 2017/5/5.
+ */
+class DepthFirstSearchTargetActionTest {
+
+    @Test
+    fun perform() {
+        val action = DepthFirstSearchTargetAction(AccessibilityNodeInfo.ACTION_CLICK, FilterAction.Filter { root ->
+            val list = ArrayList<UiObject>()
+            for (i in 0 until root.childCount) {
+                list.add(root.child(i))
+            }
+            list
+        })
+        val root = TestUiObject(5)
+        action.perform(root)
+        println(TestUiObject.max)
+        assertEquals(1, TestUiObject.count.toLong())
+    }
+
+}
\ No newline at end of file
diff --git a/automator/src/androidTest/java/com/stardust/automator/simple_action/ScrollMaxActionTest.java b/automator/src/androidTest/java/com/stardust/automator/simple_action/ScrollMaxActionTest.java
deleted file mode 100644
index a13cdee3..00000000
--- a/automator/src/androidTest/java/com/stardust/automator/simple_action/ScrollMaxActionTest.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.stardust.automator.simple_action;
-
-import android.view.accessibility.AccessibilityNodeInfo;
-
-import com.stardust.automator.UiObject;
-import com.stardust.automator.test.TestUiObject;
-
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-/**
- * Created by Stardust on 2017/5/5.
- */
-public class ScrollMaxActionTest {
-    @Test
-    public void perform() throws Exception {
-        ScrollMaxAction action = new ScrollMaxAction(AccessibilityNodeInfo.ACTION_SCROLL_BACKWARD);
-        UiObject root = new TestUiObject(20);
-        action.perform(root);
-        System.out.println(TestUiObject.max);
-        assertEquals(1, TestUiObject.count);
-    }
-
-}
\ No newline at end of file
diff --git a/automator/src/androidTest/java/com/stardust/automator/simple_action/ScrollMaxActionTest.kt b/automator/src/androidTest/java/com/stardust/automator/simple_action/ScrollMaxActionTest.kt
new file mode 100644
index 00000000..e4adcc2c
--- /dev/null
+++ b/automator/src/androidTest/java/com/stardust/automator/simple_action/ScrollMaxActionTest.kt
@@ -0,0 +1,26 @@
+package com.stardust.automator.simple_action
+
+import android.view.accessibility.AccessibilityNodeInfo
+
+import com.stardust.automator.UiObject
+import com.stardust.automator.test.TestUiObject
+
+import org.junit.Test
+
+import org.junit.Assert.*
+
+/**
+ * Created by Stardust on 2017/5/5.
+ */
+class ScrollMaxActionTest {
+    @Test
+    @Throws(Exception::class)
+    fun perform() {
+        val action = ScrollMaxAction(AccessibilityNodeInfo.ACTION_SCROLL_BACKWARD)
+        val root = TestUiObject(20)
+        action.perform(root)
+        println(TestUiObject.max)
+        assertEquals(1, TestUiObject.count.toLong())
+    }
+
+}
\ No newline at end of file
diff --git a/automator/src/main/java/com/stardust/automator/ActionArgument.java b/automator/src/main/java/com/stardust/automator/ActionArgument.java
deleted file mode 100644
index 25fad5e5..00000000
--- a/automator/src/main/java/com/stardust/automator/ActionArgument.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package com.stardust.automator;
-
-import android.os.Bundle;
-
-/**
- * Created by Stardust on 2017/3/9.
- */
-
-public abstract class ActionArgument {
-
-    protected final String mKey;
-
-    private ActionArgument(String key) {
-        mKey = key;
-    }
-
-    public abstract void putIn(Bundle bundle);
-
-    public static class IntActionArgument extends ActionArgument {
-
-        private final int mInt;
-
-        public IntActionArgument(String name, int i) {
-            super(name);
-            mInt = i;
-        }
-
-        @Override
-        public void putIn(Bundle bundle) {
-            bundle.putInt(mKey, mInt);
-        }
-    }
-
-    public static class CharSequenceActionArgument extends ActionArgument {
-
-        private final CharSequence mCharSequence;
-
-        public CharSequenceActionArgument(String name, CharSequence charSequence) {
-            super(name);
-            mCharSequence = charSequence;
-        }
-
-        @Override
-        public void putIn(Bundle bundle) {
-            bundle.putCharSequence(mKey, mCharSequence);
-        }
-    }
-
-    public static class FloatActionArgument extends ActionArgument {
-        private final float mFloat;
-
-        public FloatActionArgument(String name, float value) {
-            super(name);
-            mFloat = value;
-        }
-
-        @Override
-        public void putIn(Bundle bundle) {
-            bundle.putFloat(mKey, mFloat);
-        }
-    }
-
-}
diff --git a/automator/src/main/java/com/stardust/automator/ActionArgument.kt b/automator/src/main/java/com/stardust/automator/ActionArgument.kt
new file mode 100644
index 00000000..160f79c1
--- /dev/null
+++ b/automator/src/main/java/com/stardust/automator/ActionArgument.kt
@@ -0,0 +1,34 @@
+package com.stardust.automator
+
+import android.os.Bundle
+
+/**
+ * Created by Stardust on 2017/3/9.
+ */
+
+abstract class ActionArgument private constructor(protected val mKey: String) {
+
+    abstract fun putIn(bundle: Bundle)
+
+    class IntActionArgument(name: String, private val mInt: Int) : ActionArgument(name) {
+
+        override fun putIn(bundle: Bundle) {
+            bundle.putInt(mKey, mInt)
+        }
+    }
+
+    class CharSequenceActionArgument(name: String, private val mCharSequence: CharSequence) : ActionArgument(name) {
+
+        override fun putIn(bundle: Bundle) {
+            bundle.putCharSequence(mKey, mCharSequence)
+        }
+    }
+
+    class FloatActionArgument(name: String, private val mFloat: Float) : ActionArgument(name) {
+
+        override fun putIn(bundle: Bundle) {
+            bundle.putFloat(mKey, mFloat)
+        }
+    }
+
+}
diff --git a/automator/src/main/java/com/stardust/automator/GlobalActionAutomator.java b/automator/src/main/java/com/stardust/automator/GlobalActionAutomator.java
deleted file mode 100644
index c25a7cde..00000000
--- a/automator/src/main/java/com/stardust/automator/GlobalActionAutomator.java
+++ /dev/null
@@ -1,207 +0,0 @@
-package com.stardust.automator;
-
-import android.accessibilityservice.AccessibilityService;
-import android.accessibilityservice.GestureDescription;
-import android.graphics.Path;
-import android.os.Build;
-import android.os.Handler;
-import android.os.Looper;
-import android.support.annotation.Nullable;
-import android.support.annotation.RequiresApi;
-import android.view.ViewConfiguration;
-
-import com.stardust.concurrent.VolatileBox;
-import com.stardust.concurrent.VolatileDispose;
-import com.stardust.util.ScreenMetrics;
-
-/**
- * Created by Stardust on 2017/5/16.
- */
-
-public class GlobalActionAutomator {
-
-    private AccessibilityService mService;
-    private ScreenMetrics mScreenMetrics;
-    private Handler mHandler;
-
-    public GlobalActionAutomator(@Nullable Handler handler) {
-        mHandler = handler;
-    }
-
-    public void setService(AccessibilityService service) {
-        mService = service;
-    }
-
-    public void setScreenMetrics(ScreenMetrics screenMetrics) {
-        mScreenMetrics = screenMetrics;
-    }
-
-    public boolean back() {
-        return performGlobalAction(AccessibilityService.GLOBAL_ACTION_BACK);
-    }
-
-    public boolean home() {
-        return performGlobalAction(AccessibilityService.GLOBAL_ACTION_HOME);
-    }
-
-    @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
-    public boolean powerDialog() {
-        return performGlobalAction(AccessibilityService.GLOBAL_ACTION_POWER_DIALOG);
-    }
-
-    private boolean performGlobalAction(int globalAction) {
-        if (mService == null)
-            return false;
-        return mService.performGlobalAction(globalAction);
-    }
-
-    public boolean notifications() {
-        return performGlobalAction(AccessibilityService.GLOBAL_ACTION_NOTIFICATIONS);
-    }
-
-    public boolean quickSettings() {
-        return performGlobalAction(AccessibilityService.GLOBAL_ACTION_QUICK_SETTINGS);
-    }
-
-    public boolean recents() {
-        return performGlobalAction(AccessibilityService.GLOBAL_ACTION_RECENTS);
-    }
-
-    @RequiresApi(api = Build.VERSION_CODES.N)
-    public boolean splitScreen() {
-        return performGlobalAction(AccessibilityService.GLOBAL_ACTION_TOGGLE_SPLIT_SCREEN);
-    }
-
-    @RequiresApi(api = Build.VERSION_CODES.N)
-    public boolean gesture(long start, long duration, int[]... points) {
-        Path path = pointsToPath(points);
-        return gestures(new GestureDescription.StrokeDescription(path, start, duration));
-    }
-
-    private Path pointsToPath(int[][] points) {
-        Path path = new Path();
-        path.moveTo(scaleX(points[0][0]), scaleY(points[0][1]));
-        for (int i = 1; i < points.length; i++) {
-            int[] point = points[i];
-            path.lineTo(scaleX(point[0]), scaleY(point[1]));
-        }
-        return path;
-    }
-
-    @RequiresApi(api = Build.VERSION_CODES.N)
-    public void gestureAsync(long start, long duration, int[]... points) {
-        Path path = pointsToPath(points);
-        gesturesAsync(new GestureDescription.StrokeDescription(path, start, duration));
-    }
-
-    @RequiresApi(api = Build.VERSION_CODES.N)
-    public boolean gestures(GestureDescription.StrokeDescription... strokes) {
-        if (mService == null)
-            return false;
-        GestureDescription.Builder builder = new GestureDescription.Builder();
-        for (GestureDescription.StrokeDescription stroke : strokes) {
-            builder.addStroke(stroke);
-        }
-        if (mHandler == null) {
-            return gesturesWithoutHandler(builder.build());
-        } else {
-            return gesturesWithHandler(builder.build());
-        }
-    }
-
-    @RequiresApi(api = Build.VERSION_CODES.N)
-    private boolean gesturesWithHandler(GestureDescription description) {
-        final VolatileDispose<Boolean> result = new VolatileDispose<>();
-        mService.dispatchGesture(description, new AccessibilityService.GestureResultCallback() {
-            @Override
-            public void onCompleted(GestureDescription gestureDescription) {
-                result.setAndNotify(true);
-            }
-
-            @Override
-            public void onCancelled(GestureDescription gestureDescription) {
-                result.setAndNotify(false);
-            }
-        }, mHandler);
-        return result.blockedGet();
-    }
-
-    @RequiresApi(api = Build.VERSION_CODES.N)
-    private boolean gesturesWithoutHandler(GestureDescription description) {
-        prepareLooperIfNeeded();
-        final VolatileBox<Boolean> result = new VolatileBox<>(false);
-        Handler handler = new Handler(Looper.myLooper());
-        mService.dispatchGesture(description, new AccessibilityService.GestureResultCallback() {
-            @Override
-            public void onCompleted(GestureDescription gestureDescription) {
-                result.set(true);
-                quitLoop();
-            }
-
-            @Override
-            public void onCancelled(GestureDescription gestureDescription) {
-                result.set(false);
-                quitLoop();
-            }
-        }, handler);
-        Looper.loop();
-        return result.get();
-    }
-
-    @RequiresApi(api = Build.VERSION_CODES.N)
-    public void gesturesAsync(GestureDescription.StrokeDescription... strokes) {
-        if (mService == null)
-            return;
-        GestureDescription.Builder builder = new GestureDescription.Builder();
-        for (GestureDescription.StrokeDescription stroke : strokes) {
-            builder.addStroke(stroke);
-        }
-        mService.dispatchGesture(builder.build(), null, null);
-    }
-
-    private void quitLoop() {
-        Looper looper = Looper.myLooper();
-        if (looper != null) {
-            looper.quit();
-        }
-    }
-
-    private void prepareLooperIfNeeded() {
-        if (Looper.myLooper() == null) {
-            Looper.prepare();
-        }
-    }
-
-    @RequiresApi(api = Build.VERSION_CODES.N)
-    public boolean click(int x, int y) {
-        return press(x, y, ViewConfiguration.getTapTimeout() + 50);
-    }
-
-    @RequiresApi(api = Build.VERSION_CODES.N)
-    public boolean press(int x, int y, int delay) {
-        return gesture(0, delay, new int[]{x, y});
-    }
-
-    @RequiresApi(api = Build.VERSION_CODES.N)
-    public boolean longClick(int x, int y) {
-        return gesture(0, ViewConfiguration.getLongPressTimeout() + 200, new int[]{x, y});
-    }
-
-    private int scaleX(int x) {
-        if (mScreenMetrics == null)
-            return x;
-        return mScreenMetrics.scaleX(x);
-    }
-
-    private int scaleY(int y) {
-        if (mScreenMetrics == null)
-            return y;
-        return mScreenMetrics.scaleY(y);
-    }
-
-    @RequiresApi(api = Build.VERSION_CODES.N)
-    public boolean swipe(int x1, int y1, int x2, int y2, int delay) {
-        return gesture(0, delay, new int[]{x1, y1}, new int[]{x2, y2});
-    }
-
-}
diff --git a/automator/src/main/java/com/stardust/automator/GlobalActionAutomator.kt b/automator/src/main/java/com/stardust/automator/GlobalActionAutomator.kt
new file mode 100644
index 00000000..79685976
--- /dev/null
+++ b/automator/src/main/java/com/stardust/automator/GlobalActionAutomator.kt
@@ -0,0 +1,189 @@
+package com.stardust.automator
+
+import android.accessibilityservice.AccessibilityService
+import android.accessibilityservice.GestureDescription
+import android.graphics.Path
+import android.os.Build
+import android.os.Handler
+import android.os.Looper
+import androidx.annotation.RequiresApi
+import android.view.ViewConfiguration
+
+import com.stardust.concurrent.VolatileBox
+import com.stardust.concurrent.VolatileDispose
+import com.stardust.util.ScreenMetrics
+
+/**
+ * Created by Stardust on 2017/5/16.
+ */
+
+class GlobalActionAutomator(private val mHandler: Handler?) {
+
+    private var mService: AccessibilityService? = null
+    private var mScreenMetrics: ScreenMetrics? = null
+
+    fun setService(service: AccessibilityService) {
+        mService = service
+    }
+
+    fun setScreenMetrics(screenMetrics: ScreenMetrics) {
+        mScreenMetrics = screenMetrics
+    }
+
+    fun back(): Boolean {
+        return performGlobalAction(AccessibilityService.GLOBAL_ACTION_BACK)
+    }
+
+    fun home(): Boolean {
+        return performGlobalAction(AccessibilityService.GLOBAL_ACTION_HOME)
+    }
+
+    @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
+    fun powerDialog(): Boolean {
+        return performGlobalAction(AccessibilityService.GLOBAL_ACTION_POWER_DIALOG)
+    }
+
+    private fun performGlobalAction(globalAction: Int): Boolean {
+        return if (mService == null) false else mService!!.performGlobalAction(globalAction)
+    }
+
+    fun notifications(): Boolean {
+        return performGlobalAction(AccessibilityService.GLOBAL_ACTION_NOTIFICATIONS)
+    }
+
+    fun quickSettings(): Boolean {
+        return performGlobalAction(AccessibilityService.GLOBAL_ACTION_QUICK_SETTINGS)
+    }
+
+    fun recents(): Boolean {
+        return performGlobalAction(AccessibilityService.GLOBAL_ACTION_RECENTS)
+    }
+
+    @RequiresApi(api = Build.VERSION_CODES.N)
+    fun splitScreen(): Boolean {
+        return performGlobalAction(AccessibilityService.GLOBAL_ACTION_TOGGLE_SPLIT_SCREEN)
+    }
+
+    @RequiresApi(api = Build.VERSION_CODES.N)
+    fun gesture(start: Long, duration: Long, vararg points: IntArray): Boolean {
+        val path = pointsToPath(points)
+        return gestures(GestureDescription.StrokeDescription(path, start, duration))
+    }
+
+    private fun pointsToPath(points: Array<out IntArray>): Path {
+        val path = Path()
+        path.moveTo(scaleX(points[0][0]).toFloat(), scaleY(points[0][1]).toFloat())
+        for (i in 1 until points.size) {
+            val point = points[i]
+            path.lineTo(scaleX(point[0]).toFloat(), scaleY(point[1]).toFloat())
+        }
+        return path
+    }
+
+    @RequiresApi(api = Build.VERSION_CODES.N)
+    fun gestureAsync(start: Long, duration: Long, vararg points: IntArray) {
+        val path = pointsToPath(points)
+        gesturesAsync(GestureDescription.StrokeDescription(path, start, duration))
+    }
+
+    @RequiresApi(api = Build.VERSION_CODES.N)
+    fun gestures(vararg strokes: GestureDescription.StrokeDescription): Boolean {
+        if (mService == null)
+            return false
+        val builder = GestureDescription.Builder()
+        for (stroke in strokes) {
+            builder.addStroke(stroke)
+        }
+        return if (mHandler == null) {
+            gesturesWithoutHandler(builder.build())
+        } else {
+            gesturesWithHandler(builder.build())
+        }
+    }
+
+    @RequiresApi(api = Build.VERSION_CODES.N)
+    private fun gesturesWithHandler(description: GestureDescription): Boolean {
+        val result = VolatileDispose<Boolean>()
+        mService!!.dispatchGesture(description, object : AccessibilityService.GestureResultCallback() {
+            override fun onCompleted(gestureDescription: GestureDescription) {
+                result.setAndNotify(true)
+            }
+
+            override fun onCancelled(gestureDescription: GestureDescription) {
+                result.setAndNotify(false)
+            }
+        }, mHandler)
+        return result.blockedGet()
+    }
+
+    @RequiresApi(api = Build.VERSION_CODES.N)
+    private fun gesturesWithoutHandler(description: GestureDescription): Boolean {
+        prepareLooperIfNeeded()
+        val result = VolatileBox(false)
+        val handler = Handler(Looper.myLooper())
+        mService!!.dispatchGesture(description, object : AccessibilityService.GestureResultCallback() {
+            override fun onCompleted(gestureDescription: GestureDescription) {
+                result.set(true)
+                quitLoop()
+            }
+
+            override fun onCancelled(gestureDescription: GestureDescription) {
+                result.set(false)
+                quitLoop()
+            }
+        }, handler)
+        Looper.loop()
+        return result.get()
+    }
+
+    @RequiresApi(api = Build.VERSION_CODES.N)
+    fun gesturesAsync(vararg strokes: GestureDescription.StrokeDescription) {
+        if (mService == null)
+            return
+        val builder = GestureDescription.Builder()
+        for (stroke in strokes) {
+            builder.addStroke(stroke)
+        }
+        mService!!.dispatchGesture(builder.build(), null, null)
+    }
+
+    private fun quitLoop() {
+        val looper = Looper.myLooper()
+        looper?.quit()
+    }
+
+    private fun prepareLooperIfNeeded() {
+        if (Looper.myLooper() == null) {
+            Looper.prepare()
+        }
+    }
+
+    @RequiresApi(api = Build.VERSION_CODES.N)
+    fun click(x: Int, y: Int): Boolean {
+        return press(x, y, ViewConfiguration.getTapTimeout() + 50)
+    }
+
+    @RequiresApi(api = Build.VERSION_CODES.N)
+    fun press(x: Int, y: Int, delay: Int): Boolean {
+        return gesture(0, delay.toLong(), intArrayOf(x, y))
+    }
+
+    @RequiresApi(api = Build.VERSION_CODES.N)
+    fun longClick(x: Int, y: Int): Boolean {
+        return gesture(0, (ViewConfiguration.getLongPressTimeout() + 200).toLong(), intArrayOf(x, y))
+    }
+
+    private fun scaleX(x: Int): Int {
+        return if (mScreenMetrics == null) x else mScreenMetrics!!.scaleX(x)
+    }
+
+    private fun scaleY(y: Int): Int {
+        return if (mScreenMetrics == null) y else mScreenMetrics!!.scaleY(y)
+    }
+
+    @RequiresApi(api = Build.VERSION_CODES.N)
+    fun swipe(x1: Int, y1: Int, x2: Int, y2: Int, delay: Long): Boolean {
+        return gesture(0, delay, intArrayOf(x1, y1), intArrayOf(x2, y2))
+    }
+
+}
diff --git a/automator/src/main/java/com/stardust/automator/UiGlobalSelector.java b/automator/src/main/java/com/stardust/automator/UiGlobalSelector.java
deleted file mode 100644
index 59668277..00000000
--- a/automator/src/main/java/com/stardust/automator/UiGlobalSelector.java
+++ /dev/null
@@ -1,454 +0,0 @@
-package com.stardust.automator;
-
-import android.graphics.Rect;
-import android.os.Build;
-import android.support.annotation.Nullable;
-
-import com.stardust.automator.filter.BooleanFilter;
-import com.stardust.automator.filter.BoundsFilter;
-import com.stardust.automator.filter.ClassNameFilter;
-import com.stardust.automator.filter.DescFilter;
-import com.stardust.automator.filter.DfsFilter;
-import com.stardust.automator.filter.IdFilter;
-import com.stardust.automator.filter.IntFilter;
-import com.stardust.automator.filter.ListFilter;
-import com.stardust.automator.filter.PackageNameFilter;
-import com.stardust.automator.filter.TextFilter;
-import com.stardust.automator.simple_action.Able;
-import com.stardust.util.Supplier;
-
-import java.util.ArrayList;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Queue;
-
-/**
- * Created by Stardust on 2017/3/8.
- */
-
-public class UiGlobalSelector {
-
-    private Queue<ListFilter> mFilters = new LinkedList<>();
-
-    //// 第一类筛选条件
-
-    public UiGlobalSelector id(String id) {
-        mFilters.add(IdFilter.equals(id));
-        return this;
-    }
-
-    public UiGlobalSelector idContains(String str) {
-        mFilters.add(IdFilter.contains(str));
-        return this;
-    }
-
-    public UiGlobalSelector idStartsWith(String prefix) {
-        mFilters.add(IdFilter.startsWith(prefix));
-        return this;
-    }
-
-    public UiGlobalSelector idEndsWith(String suffix) {
-        mFilters.add(IdFilter.endsWith(suffix));
-        return this;
-    }
-
-    public UiGlobalSelector idMatches(String regex) {
-        mFilters.add(IdFilter.matches(regex));
-        return this;
-    }
-
-    public UiGlobalSelector text(String text) {
-        mFilters.add(TextFilter.equals(text));
-        return this;
-    }
-
-    public UiGlobalSelector textContains(String str) {
-        mFilters.add(TextFilter.contains(str));
-        return this;
-    }
-
-    public UiGlobalSelector textStartsWith(String prefix) {
-        mFilters.add(TextFilter.startsWith(prefix));
-        return this;
-    }
-
-    public UiGlobalSelector textEndsWith(String suffix) {
-        mFilters.add(TextFilter.endsWith(suffix));
-        return this;
-    }
-
-    public UiGlobalSelector textMatches(String regex) {
-        mFilters.add(TextFilter.matches(regex));
-        return this;
-    }
-
-    public UiGlobalSelector desc(String desc) {
-        mFilters.add(DescFilter.equals(desc));
-        return this;
-    }
-
-    public UiGlobalSelector descContains(String str) {
-        mFilters.add(DescFilter.contains(str));
-        return this;
-    }
-
-    public UiGlobalSelector descStartsWith(String prefix) {
-        mFilters.add(DescFilter.startsWith(prefix));
-        return this;
-    }
-
-    public UiGlobalSelector descEndsWith(String suffix) {
-        mFilters.add(DescFilter.endsWith(suffix));
-        return this;
-    }
-
-    public UiGlobalSelector descMatches(String regex) {
-        mFilters.add(DescFilter.matches(regex));
-        return this;
-    }
-
-    public UiGlobalSelector className(String className) {
-        mFilters.add(ClassNameFilter.equals(className));
-        return this;
-    }
-
-    public UiGlobalSelector classNameContains(String str) {
-        mFilters.add(ClassNameFilter.contains(str));
-        return this;
-    }
-
-    public UiGlobalSelector classNameStartsWith(String prefix) {
-        mFilters.add(ClassNameFilter.startsWith(prefix));
-        return this;
-    }
-
-    public UiGlobalSelector classNameEndsWith(String suffix) {
-        mFilters.add(ClassNameFilter.endsWith(suffix));
-        return this;
-    }
-
-    public UiGlobalSelector classNameMatches(String regex) {
-        mFilters.add(ClassNameFilter.matches(regex));
-        return this;
-    }
-
-    public UiGlobalSelector packageName(String packageName) {
-        mFilters.add(PackageNameFilter.equals(packageName));
-        return this;
-    }
-
-    public UiGlobalSelector packageNameContains(String str) {
-        mFilters.add(PackageNameFilter.contains(str));
-        return this;
-    }
-
-    public UiGlobalSelector packageNameStartsWith(String prefix) {
-        mFilters.add(PackageNameFilter.startsWith(prefix));
-        return this;
-    }
-
-    public UiGlobalSelector packageNameEndsWith(String suffix) {
-        mFilters.add(PackageNameFilter.endsWith(suffix));
-        return this;
-    }
-
-    public UiGlobalSelector packageNameMatches(String regex) {
-        mFilters.add(PackageNameFilter.matches(regex));
-        return this;
-    }
-
-    public UiGlobalSelector bounds(int l, int t, int r, int b) {
-        mFilters.add(new BoundsFilter(new Rect(l, t, r, b), BoundsFilter.TYPE_EQUALS));
-        return this;
-    }
-
-    public UiGlobalSelector boundsInside(int l, int t, int r, int b) {
-        mFilters.add(new BoundsFilter(new Rect(l, t, r, b), BoundsFilter.TYPE_INSIDE));
-        return this;
-    }
-
-    public UiGlobalSelector boundsContains(int l, int t, int r, int b) {
-        mFilters.add(new BoundsFilter(new Rect(l, t, r, b), BoundsFilter.TYPE_CONTAINS));
-        return this;
-    }
-
-    public UiGlobalSelector drawingOrder(final int order) {
-        mFilters.add(new DfsFilter() {
-            @Override
-            protected boolean isIncluded(UiObject nodeInfo) {
-                return Build.VERSION.SDK_INT >= Build.VERSION_CODES.N && nodeInfo.getDrawingOrder() == order;
-            }
-
-            @Override
-            public String toString() {
-                return "drawingOrder(" + order + ")";
-            }
-        });
-        return this;
-    }
-
-    //// 第二类筛选条件 -able
-
-    public UiGlobalSelector checkable(boolean b) {
-        mFilters.add(BooleanFilter.get(BooleanFilter.CHECKABLE, b));
-        return this;
-    }
-
-    public UiGlobalSelector checked(boolean b) {
-        mFilters.add(BooleanFilter.get(BooleanFilter.CHECKED, b));
-        return this;
-    }
-
-    public UiGlobalSelector focusable(boolean b) {
-        mFilters.add(BooleanFilter.get(BooleanFilter.FOCUSABLE, b));
-        return this;
-    }
-
-    public UiGlobalSelector focused(boolean b) {
-        mFilters.add(BooleanFilter.get(BooleanFilter.FOCUSED, b));
-        return this;
-    }
-
-    public UiGlobalSelector visibleToUser(boolean b) {
-        mFilters.add(BooleanFilter.get(BooleanFilter.VISIBLE_TO_USER, b));
-        return this;
-    }
-
-    public UiGlobalSelector accessibilityFocused(boolean b) {
-        mFilters.add(BooleanFilter.get(BooleanFilter.ACCESSIBILITY_FOCUSED, b));
-        return this;
-    }
-
-    public UiGlobalSelector selected(boolean b) {
-        mFilters.add(BooleanFilter.get(BooleanFilter.SELECTED, b));
-        return this;
-    }
-
-    public UiGlobalSelector clickable(boolean b) {
-        mFilters.add(BooleanFilter.get(BooleanFilter.CLICKABLE, b));
-        return this;
-    }
-
-    public UiGlobalSelector longClickable(boolean b) {
-        mFilters.add(BooleanFilter.get(BooleanFilter.LONG_CLICKABLE, b));
-        return this;
-    }
-
-    public UiGlobalSelector enabled(boolean b) {
-        mFilters.add(BooleanFilter.get(BooleanFilter.ENABLED, b));
-        return this;
-    }
-
-    public UiGlobalSelector password(boolean b) {
-        mFilters.add(BooleanFilter.get(BooleanFilter.PASSWORD, b));
-        return this;
-    }
-
-    public UiGlobalSelector scrollable(boolean b) {
-        mFilters.add(BooleanFilter.get(BooleanFilter.SCROLLABLE, b));
-        return this;
-    }
-
-    public UiGlobalSelector editable(boolean b) {
-        mFilters.add(BooleanFilter.get(BooleanFilter.EDITABLE, b));
-        return this;
-    }
-
-    public UiGlobalSelector contentInvalid(boolean b) {
-        mFilters.add(BooleanFilter.get(BooleanFilter.CONTENT_INVALID, b));
-        return this;
-    }
-
-    public UiGlobalSelector contextClickable(boolean b) {
-        mFilters.add(BooleanFilter.get(BooleanFilter.CONTEXT_CLICKABLE, b));
-        return this;
-    }
-
-    public UiGlobalSelector multiLine(boolean b) {
-        mFilters.add(BooleanFilter.get(BooleanFilter.MULTI_LINE, b));
-        return this;
-    }
-
-    public UiGlobalSelector dismissable(boolean b) {
-        mFilters.add(BooleanFilter.get(BooleanFilter.DISMISSABLE, b));
-        return this;
-    }
-
-    public UiGlobalSelector checkable() {
-        mFilters.add(BooleanFilter.get(BooleanFilter.CHECKABLE, true));
-        return this;
-    }
-
-    public UiGlobalSelector checked() {
-        mFilters.add(BooleanFilter.get(BooleanFilter.CHECKED, true));
-        return this;
-    }
-
-    public UiGlobalSelector focusable() {
-        mFilters.add(BooleanFilter.get(BooleanFilter.FOCUSABLE, true));
-        return this;
-    }
-
-    public UiGlobalSelector focused() {
-        mFilters.add(BooleanFilter.get(BooleanFilter.FOCUSED, true));
-        return this;
-    }
-
-    public UiGlobalSelector visibleToUser() {
-        mFilters.add(BooleanFilter.get(BooleanFilter.VISIBLE_TO_USER, true));
-        return this;
-    }
-
-    public UiGlobalSelector accessibilityFocused() {
-        mFilters.add(BooleanFilter.get(BooleanFilter.ACCESSIBILITY_FOCUSED, true));
-        return this;
-    }
-
-    public UiGlobalSelector selected() {
-        mFilters.add(BooleanFilter.get(BooleanFilter.SELECTED, true));
-        return this;
-    }
-
-    public UiGlobalSelector clickable() {
-        mFilters.add(BooleanFilter.get(BooleanFilter.CLICKABLE, true));
-        return this;
-    }
-
-    public UiGlobalSelector longClickable() {
-        mFilters.add(BooleanFilter.get(BooleanFilter.LONG_CLICKABLE, true));
-        return this;
-    }
-
-    public UiGlobalSelector enabled() {
-        mFilters.add(BooleanFilter.get(BooleanFilter.ENABLED, true));
-        return this;
-    }
-
-    public UiGlobalSelector password() {
-        mFilters.add(BooleanFilter.get(BooleanFilter.PASSWORD, true));
-        return this;
-    }
-
-    public UiGlobalSelector scrollable() {
-        mFilters.add(BooleanFilter.get(BooleanFilter.SCROLLABLE, true));
-        return this;
-    }
-
-    public UiGlobalSelector editable() {
-        mFilters.add(BooleanFilter.get(BooleanFilter.EDITABLE, true));
-        return this;
-    }
-
-    public UiGlobalSelector contentInvalid() {
-        mFilters.add(BooleanFilter.get(BooleanFilter.CONTENT_INVALID, true));
-        return this;
-    }
-
-    public UiGlobalSelector contextClickable() {
-        mFilters.add(BooleanFilter.get(BooleanFilter.CONTEXT_CLICKABLE, true));
-        return this;
-    }
-
-    public UiGlobalSelector multiLine() {
-        mFilters.add(BooleanFilter.get(BooleanFilter.MULTI_LINE, true));
-        return this;
-    }
-
-    public UiGlobalSelector dismissable() {
-        mFilters.add(BooleanFilter.get(BooleanFilter.DISMISSABLE, true));
-        return this;
-    }
-
-
-    //第三类 int
-    public UiGlobalSelector depth(int d) {
-        mFilters.add(new IntFilter(IntFilter.DEPTH, d));
-        return this;
-    }
-
-    public UiGlobalSelector row(int d) {
-        mFilters.add(new IntFilter(IntFilter.ROW, d));
-        return this;
-    }
-
-    public UiGlobalSelector rowCount(int d) {
-        mFilters.add(new IntFilter(IntFilter.ROW_COUNT, d));
-        return this;
-    }
-
-    public UiGlobalSelector rowSpan(int d) {
-        mFilters.add(new IntFilter(IntFilter.ROW_SPAN, d));
-        return this;
-    }
-
-    public UiGlobalSelector column(int d) {
-        mFilters.add(new IntFilter(IntFilter.COLUMN, d));
-        return this;
-    }
-
-    public UiGlobalSelector columnCount(int d) {
-        mFilters.add(new IntFilter(IntFilter.COLUMN_COUNT, d));
-        return this;
-    }
-
-    public UiGlobalSelector columnSpan(int d) {
-        mFilters.add(new IntFilter(IntFilter.COLUMN_SPAN, d));
-        return this;
-    }
-
-    public UiGlobalSelector indexInParent(int index) {
-        mFilters.add(new IntFilter(IntFilter.INDEX_IN_PARENT, index));
-        return this;
-    }
-
-
-    public UiGlobalSelector filter(final BooleanFilter.BooleanSupplier filter) {
-        mFilters.add(new DfsFilter() {
-            @Override
-            protected boolean isIncluded(UiObject nodeInfo) {
-                return filter.get(nodeInfo);
-            }
-        });
-        return this;
-    }
-
-    public UiObjectCollection findOf(UiObject node) {
-        return UiObjectCollection.of(findAndReturnList(node));
-    }
-
-    public List<UiObject> findAndReturnList(UiObject node) {
-        List<UiObject> list = new ArrayList<>();
-        list.add(node);
-        for (ListFilter filter : mFilters) {
-            list = filter.filter(list);
-        }
-        return list;
-    }
-
-    @Nullable
-    public UiObject findOneOf(UiObject node) {
-        // TODO: 2017/3/9 优化
-        UiObjectCollection collection = findOf(node);
-        if (collection.size() == 0) {
-            return null;
-        }
-        return collection.get(0);
-    }
-
-    public UiGlobalSelector addFilter(ListFilter filter) {
-        mFilters.add(filter);
-        return this;
-    }
-
-    @Override
-    public String toString() {
-        StringBuilder str = new StringBuilder();
-        for (ListFilter filter : mFilters) {
-            str.append(filter.toString()).append(".");
-        }
-        if(str.length() > 0){
-            str.deleteCharAt(str.length() - 1);
-        }
-        return str.toString();
-    }
-}
diff --git a/automator/src/main/java/com/stardust/automator/UiGlobalSelector.kt b/automator/src/main/java/com/stardust/automator/UiGlobalSelector.kt
new file mode 100644
index 00000000..51758b63
--- /dev/null
+++ b/automator/src/main/java/com/stardust/automator/UiGlobalSelector.kt
@@ -0,0 +1,440 @@
+package com.stardust.automator
+
+import android.graphics.Rect
+import android.os.Build
+import com.stardust.automator.filter.*
+import com.stardust.automator.search.BFS
+import com.stardust.automator.search.DFS
+import com.stardust.automator.search.SearchAlgorithm
+import java.lang.IllegalArgumentException
+
+/**
+ * Created by Stardust on 2017/3/8.
+ */
+
+open class UiGlobalSelector {
+
+    private val mSelector = Selector()
+    private var mSearchAlgorithm: SearchAlgorithm = DFS
+
+    //// 第一类筛选条件
+
+    open fun id(id: String): UiGlobalSelector {
+        mSelector.add(IdFilter.equals(id))
+        return this
+    }
+
+    fun idContains(str: String): UiGlobalSelector {
+        mSelector.add(IdFilter.contains(str))
+        return this
+    }
+
+    open fun idStartsWith(prefix: String): UiGlobalSelector {
+        mSelector.add(IdFilter.startsWith(prefix))
+        return this
+    }
+
+    fun idEndsWith(suffix: String): UiGlobalSelector {
+        mSelector.add(IdFilter.endsWith(suffix))
+        return this
+    }
+
+    open fun idMatches(regex: String): UiGlobalSelector {
+        mSelector.add(IdFilter.matches(regex))
+        return this
+    }
+
+    fun text(text: String): UiGlobalSelector {
+        mSelector.add(TextFilters.equals(text))
+        return this
+    }
+
+    fun textContains(str: String): UiGlobalSelector {
+        mSelector.add(TextFilters.contains(str))
+        return this
+    }
+
+    fun textStartsWith(prefix: String): UiGlobalSelector {
+        mSelector.add(TextFilters.startsWith(prefix))
+        return this
+    }
+
+    fun textEndsWith(suffix: String): UiGlobalSelector {
+        mSelector.add(TextFilters.endsWith(suffix))
+        return this
+    }
+
+    open fun textMatches(regex: String): UiGlobalSelector {
+        mSelector.add(TextFilters.matches(regex))
+        return this
+    }
+
+    fun desc(desc: String): UiGlobalSelector {
+        mSelector.add(DescFilters.equals(desc))
+        return this
+    }
+
+    fun descContains(str: String): UiGlobalSelector {
+        mSelector.add(DescFilters.contains(str))
+        return this
+    }
+
+    fun descStartsWith(prefix: String): UiGlobalSelector {
+        mSelector.add(DescFilters.startsWith(prefix))
+        return this
+    }
+
+    fun descEndsWith(suffix: String): UiGlobalSelector {
+        mSelector.add(DescFilters.endsWith(suffix))
+        return this
+    }
+
+    open fun descMatches(regex: String): UiGlobalSelector {
+        mSelector.add(DescFilters.matches(regex))
+        return this
+    }
+
+    fun className(className: String): UiGlobalSelector {
+        mSelector.add(ClassNameFilters.equals(className))
+        return this
+    }
+
+    fun classNameContains(str: String): UiGlobalSelector {
+        mSelector.add(ClassNameFilters.contains(str))
+        return this
+    }
+
+    fun classNameStartsWith(prefix: String): UiGlobalSelector {
+        mSelector.add(ClassNameFilters.startsWith(prefix))
+        return this
+    }
+
+    fun classNameEndsWith(suffix: String): UiGlobalSelector {
+        mSelector.add(ClassNameFilters.endsWith(suffix))
+        return this
+    }
+
+    open fun classNameMatches(regex: String): UiGlobalSelector {
+        mSelector.add(ClassNameFilters.matches(regex))
+        return this
+    }
+
+    fun packageName(packageName: String): UiGlobalSelector {
+        mSelector.add(PackageNameFilter.equals(packageName))
+        return this
+    }
+
+    fun packageNameContains(str: String): UiGlobalSelector {
+        mSelector.add(PackageNameFilter.contains(str))
+        return this
+    }
+
+    fun packageNameStartsWith(prefix: String): UiGlobalSelector {
+        mSelector.add(PackageNameFilter.startsWith(prefix))
+        return this
+    }
+
+    fun packageNameEndsWith(suffix: String): UiGlobalSelector {
+        mSelector.add(PackageNameFilter.endsWith(suffix))
+        return this
+    }
+
+    open fun packageNameMatches(regex: String): UiGlobalSelector {
+        mSelector.add(PackageNameFilter.matches(regex))
+        return this
+    }
+
+    fun bounds(l: Int, t: Int, r: Int, b: Int): UiGlobalSelector {
+        mSelector.add(BoundsFilter(Rect(l, t, r, b), BoundsFilter.TYPE_EQUALS))
+        return this
+    }
+
+    fun boundsInside(l: Int, t: Int, r: Int, b: Int): UiGlobalSelector {
+        mSelector.add(BoundsFilter(Rect(l, t, r, b), BoundsFilter.TYPE_INSIDE))
+        return this
+    }
+
+    fun boundsContains(l: Int, t: Int, r: Int, b: Int): UiGlobalSelector {
+        mSelector.add(BoundsFilter(Rect(l, t, r, b), BoundsFilter.TYPE_CONTAINS))
+        return this
+    }
+
+    fun drawingOrder(order: Int): UiGlobalSelector {
+        mSelector.add(object : Filter {
+            override fun filter(node: UiObject): Boolean {
+                return Build.VERSION.SDK_INT >= Build.VERSION_CODES.N && node.drawingOrder == order
+            }
+
+            override fun toString(): String {
+                return "drawingOrder($order)"
+            }
+        })
+        return this
+    }
+
+    //// 第二类筛选条件 -able
+
+    fun checkable(b: Boolean): UiGlobalSelector {
+        mSelector.add(BooleanFilter[BooleanFilter.CHECKABLE, b])
+        return this
+    }
+
+    fun checked(b: Boolean): UiGlobalSelector {
+        mSelector.add(BooleanFilter[BooleanFilter.CHECKED, b])
+        return this
+    }
+
+    fun focusable(b: Boolean): UiGlobalSelector {
+        mSelector.add(BooleanFilter[BooleanFilter.FOCUSABLE, b])
+        return this
+    }
+
+    fun focused(b: Boolean): UiGlobalSelector {
+        mSelector.add(BooleanFilter[BooleanFilter.FOCUSED, b])
+        return this
+    }
+
+    fun visibleToUser(b: Boolean): UiGlobalSelector {
+        mSelector.add(BooleanFilter[BooleanFilter.VISIBLE_TO_USER, b])
+        return this
+    }
+
+    fun accessibilityFocused(b: Boolean): UiGlobalSelector {
+        mSelector.add(BooleanFilter[BooleanFilter.ACCESSIBILITY_FOCUSED, b])
+        return this
+    }
+
+    fun selected(b: Boolean): UiGlobalSelector {
+        mSelector.add(BooleanFilter[BooleanFilter.SELECTED, b])
+        return this
+    }
+
+    fun clickable(b: Boolean): UiGlobalSelector {
+        mSelector.add(BooleanFilter[BooleanFilter.CLICKABLE, b])
+        return this
+    }
+
+    fun longClickable(b: Boolean): UiGlobalSelector {
+        mSelector.add(BooleanFilter[BooleanFilter.LONG_CLICKABLE, b])
+        return this
+    }
+
+    fun enabled(b: Boolean): UiGlobalSelector {
+        mSelector.add(BooleanFilter[BooleanFilter.ENABLED, b])
+        return this
+    }
+
+    fun password(b: Boolean): UiGlobalSelector {
+        mSelector.add(BooleanFilter[BooleanFilter.PASSWORD, b])
+        return this
+    }
+
+    fun scrollable(b: Boolean): UiGlobalSelector {
+        mSelector.add(BooleanFilter[BooleanFilter.SCROLLABLE, b])
+        return this
+    }
+
+    fun editable(b: Boolean): UiGlobalSelector {
+        mSelector.add(BooleanFilter[BooleanFilter.EDITABLE, b])
+        return this
+    }
+
+    fun contentInvalid(b: Boolean): UiGlobalSelector {
+        mSelector.add(BooleanFilter[BooleanFilter.CONTENT_INVALID, b])
+        return this
+    }
+
+    fun contextClickable(b: Boolean): UiGlobalSelector {
+        mSelector.add(BooleanFilter[BooleanFilter.CONTEXT_CLICKABLE, b])
+        return this
+    }
+
+    fun multiLine(b: Boolean): UiGlobalSelector {
+        mSelector.add(BooleanFilter[BooleanFilter.MULTI_LINE, b])
+        return this
+    }
+
+    fun dismissable(b: Boolean): UiGlobalSelector {
+        mSelector.add(BooleanFilter[BooleanFilter.DISMISSABLE, b])
+        return this
+    }
+
+    fun checkable(): UiGlobalSelector {
+        mSelector.add(BooleanFilter[BooleanFilter.CHECKABLE, true])
+        return this
+    }
+
+    fun checked(): UiGlobalSelector {
+        mSelector.add(BooleanFilter[BooleanFilter.CHECKED, true])
+        return this
+    }
+
+    fun focusable(): UiGlobalSelector {
+        mSelector.add(BooleanFilter[BooleanFilter.FOCUSABLE, true])
+        return this
+    }
+
+    fun focused(): UiGlobalSelector {
+        mSelector.add(BooleanFilter[BooleanFilter.FOCUSED, true])
+        return this
+    }
+
+    fun visibleToUser(): UiGlobalSelector {
+        mSelector.add(BooleanFilter[BooleanFilter.VISIBLE_TO_USER, true])
+        return this
+    }
+
+    fun accessibilityFocused(): UiGlobalSelector {
+        mSelector.add(BooleanFilter[BooleanFilter.ACCESSIBILITY_FOCUSED, true])
+        return this
+    }
+
+    fun selected(): UiGlobalSelector {
+        mSelector.add(BooleanFilter[BooleanFilter.SELECTED, true])
+        return this
+    }
+
+    fun clickable(): UiGlobalSelector {
+        mSelector.add(BooleanFilter[BooleanFilter.CLICKABLE, true])
+        return this
+    }
+
+    fun longClickable(): UiGlobalSelector {
+        mSelector.add(BooleanFilter[BooleanFilter.LONG_CLICKABLE, true])
+        return this
+    }
+
+    fun enabled(): UiGlobalSelector {
+        mSelector.add(BooleanFilter[BooleanFilter.ENABLED, true])
+        return this
+    }
+
+    fun password(): UiGlobalSelector {
+        mSelector.add(BooleanFilter[BooleanFilter.PASSWORD, true])
+        return this
+    }
+
+    fun scrollable(): UiGlobalSelector {
+        mSelector.add(BooleanFilter[BooleanFilter.SCROLLABLE, true])
+        return this
+    }
+
+    fun editable(): UiGlobalSelector {
+        mSelector.add(BooleanFilter[BooleanFilter.EDITABLE, true])
+        return this
+    }
+
+    fun contentInvalid(): UiGlobalSelector {
+        mSelector.add(BooleanFilter[BooleanFilter.CONTENT_INVALID, true])
+        return this
+    }
+
+    fun contextClickable(): UiGlobalSelector {
+        mSelector.add(BooleanFilter[BooleanFilter.CONTEXT_CLICKABLE, true])
+        return this
+    }
+
+    fun multiLine(): UiGlobalSelector {
+        mSelector.add(BooleanFilter[BooleanFilter.MULTI_LINE, true])
+        return this
+    }
+
+    fun dismissable(): UiGlobalSelector {
+        mSelector.add(BooleanFilter[BooleanFilter.DISMISSABLE, true])
+        return this
+    }
+
+
+    //第三类 int
+    fun depth(d: Int): UiGlobalSelector {
+        mSelector.add(IntFilter(IntFilter.DEPTH, d))
+        return this
+    }
+
+    fun row(d: Int): UiGlobalSelector {
+        mSelector.add(IntFilter(IntFilter.ROW, d))
+        return this
+    }
+
+    fun rowCount(d: Int): UiGlobalSelector {
+        mSelector.add(IntFilter(IntFilter.ROW_COUNT, d))
+        return this
+    }
+
+    fun rowSpan(d: Int): UiGlobalSelector {
+        mSelector.add(IntFilter(IntFilter.ROW_SPAN, d))
+        return this
+    }
+
+    fun column(d: Int): UiGlobalSelector {
+        mSelector.add(IntFilter(IntFilter.COLUMN, d))
+        return this
+    }
+
+    fun columnCount(d: Int): UiGlobalSelector {
+        mSelector.add(IntFilter(IntFilter.COLUMN_COUNT, d))
+        return this
+    }
+
+    fun columnSpan(d: Int): UiGlobalSelector {
+        mSelector.add(IntFilter(IntFilter.COLUMN_SPAN, d))
+        return this
+    }
+
+    fun indexInParent(index: Int): UiGlobalSelector {
+        mSelector.add(IntFilter(IntFilter.INDEX_IN_PARENT, index))
+        return this
+    }
+
+
+    fun filter(filter: BooleanFilter.BooleanSupplier): UiGlobalSelector {
+        mSelector.add(object : Filter {
+            override fun filter(node: UiObject): Boolean {
+                return filter[node]
+            }
+        })
+        return this
+    }
+
+    fun findOf(node: UiObject, max: Int): UiObjectCollection {
+        return UiObjectCollection.of(findAndReturnList(node, max))
+    }
+
+    fun findOf(node: UiObject): UiObjectCollection {
+        return findOf(node, Int.MAX_VALUE)
+    }
+
+
+    fun findOneOf(node: UiObject): UiObject? {
+        val collection = findOf(node, 1)
+        return if (collection.size() == 0) {
+            null
+        } else collection[0]
+    }
+
+    fun addFilter(filter: Filter): UiGlobalSelector {
+        mSelector.add(filter)
+        return this
+    }
+
+    fun algorithm(algorithm: String): UiGlobalSelector {
+        if (algorithm.equals("BFS", true)) {
+            mSearchAlgorithm = BFS
+            return this
+        }
+        if (algorithm.equals("DFS", true)) {
+            mSearchAlgorithm = DFS
+            return this
+        }
+        throw IllegalArgumentException("unknown algorithm: $algorithm")
+    }
+
+    fun findAndReturnList(node: UiObject, max: Int = Int.MAX_VALUE): List<UiObject> {
+        return mSearchAlgorithm.search(node, mSelector, max)
+    }
+
+
+    override fun toString(): String {
+        return mSelector.toString()
+    }
+}
diff --git a/automator/src/main/java/com/stardust/automator/UiObject.java b/automator/src/main/java/com/stardust/automator/UiObject.java
deleted file mode 100644
index e3703366..00000000
--- a/automator/src/main/java/com/stardust/automator/UiObject.java
+++ /dev/null
@@ -1,458 +0,0 @@
-package com.stardust.automator;
-
-import android.graphics.Rect;
-import android.os.Build;
-import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat;
-import android.util.Log;
-import android.view.accessibility.AccessibilityNodeInfo;
-
-import com.stardust.view.accessibility.AccessibilityNodeInfoAllocator;
-import com.stardust.view.accessibility.AccessibilityNodeInfoHelper;
-import com.stardust.view.accessibility.AccessibilityService;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import static android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_CONTEXT_CLICK;
-import static android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_SCROLL_DOWN;
-import static android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_SCROLL_LEFT;
-import static android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_SCROLL_RIGHT;
-import static android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_SCROLL_TO_POSITION;
-import static android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_SCROLL_UP;
-import static android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_SET_PROGRESS;
-import static android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_SHOW_ON_SCREEN;
-
-/**
- * Created by Stardust on 2017/3/9.
- */
-
-public class UiObject extends AccessibilityNodeInfoCompat {
-
-    public static final int ACTION_APPEND_TEXT = 0x00200001;
-
-    private static final String TAG = "UiObject";
-    private static final boolean DEBUG = false;
-
-
-    public static UiObject createRoot(AccessibilityNodeInfo root) {
-        return new UiObject(root, null, 0, -1);
-    }
-
-    public static UiObject createRoot(AccessibilityNodeInfo root, AccessibilityNodeInfoAllocator allocator) {
-        return new UiObject(root, allocator, 0, -1);
-    }
-
-
-    private AccessibilityNodeInfoAllocator mAllocator = null;
-    private String mStackTrace = "";
-    private int mDepth = 0;
-    private final int mIndexInParent;
-
-    public UiObject(Object info) {
-        this(info, 0, -1);
-    }
-
-    public UiObject(Object info, AccessibilityNodeInfoAllocator allocator, int depth, int indexInParent) {
-        super(info);
-        mDepth = depth;
-        mAllocator = allocator;
-        mIndexInParent = indexInParent;
-        if (DEBUG)
-            mStackTrace = Arrays.toString(Thread.currentThread().getStackTrace());
-
-    }
-
-
-    public UiObject(Object info, AccessibilityNodeInfoAllocator allocator, int indexInParent) {
-        this(info, allocator, 0, indexInParent);
-    }
-
-    public UiObject(Object info, int depth, int indexInParent) {
-        this(info, null, depth, indexInParent);
-    }
-
-    @Nullable
-    public UiObject parent() {
-        try {
-            AccessibilityNodeInfoCompat parent = super.getParent();
-            if (parent == null)
-                return null;
-            return new UiObject(parent.getInfo(), mDepth - 1, -1);
-        } catch (IllegalStateException e) {
-            // FIXME: 2017/5/5
-            return null;
-        }
-    }
-
-    @Nullable
-    public UiObject child(int i) {
-        try {
-            AccessibilityNodeInfoCompat child = super.getChild(i);
-            if (child == null)
-                return null;
-            return new UiObject(child.getInfo(), mDepth + 1, i);
-        } catch (IllegalStateException e) {
-            // FIXME: 2017/5/5
-            return null;
-        }
-    }
-
-    public int indexInParent() {
-        return mIndexInParent;
-    }
-
-    public UiObjectCollection find(UiGlobalSelector selector) {
-        return selector.findOf(this);
-    }
-
-    public UiObject findOne(UiGlobalSelector selector) {
-        return selector.findOneOf(this);
-    }
-
-    public UiObjectCollection children() {
-        ArrayList<UiObject> list = new ArrayList<>(getChildCount());
-        for (int i = 0; i < getChildCount(); i++) {
-            list.add(child(i));
-        }
-        return UiObjectCollection.of(list);
-    }
-
-    public int childCount() {
-        return getChildCount();
-    }
-
-    public Rect bounds() {
-        return AccessibilityNodeInfoHelper.getBoundsInScreen(this);
-    }
-
-    public Rect boundsInParent() {
-        return AccessibilityNodeInfoHelper.getBoundsInParent(this);
-    }
-
-    public int drawingOrder() {
-        return getDrawingOrder();
-    }
-
-    public String id() {
-        return getViewIdResourceName();
-    }
-
-    @NonNull
-    public String text() {
-        CharSequence t = getText();
-        return t == null ? "" : t.toString();
-    }
-
-    @Override
-    public CharSequence getText() {
-        if (isPassword()) {
-            return "";
-        }
-        return super.getText();
-    }
-
-    public String desc() {
-        CharSequence d = getContentDescription();
-        return d == null ? null : d.toString();
-    }
-
-    public String className() {
-        CharSequence d = getClassName();
-        return d == null ? null : d.toString();
-    }
-
-    public String packageName() {
-        CharSequence d = getPackageName();
-        return d == null ? null : d.toString();
-    }
-
-    public int depth() {
-        return mDepth;
-    }
-
-    public boolean performAction(int action, ActionArgument... arguments) {
-        Bundle bundle = argumentsToBundle(arguments);
-        return performAction(action, bundle);
-    }
-
-    @Override
-    public boolean performAction(int action, Bundle bundle) {
-        try {
-            return super.performAction(action, bundle);
-        } catch (IllegalStateException e) {
-            // FIXME: 2017/5/5
-            return false;
-        }
-    }
-
-    @Override
-    public boolean performAction(int action) {
-        try {
-            return super.performAction(action);
-        } catch (IllegalStateException e) {
-            // FIXME: 2017/5/5
-            return false;
-        }
-
-
-    }
-
-
-    public AccessibilityNodeInfoAllocator getAllocator() {
-        return mAllocator;
-    }
-
-    private static Bundle argumentsToBundle(ActionArgument[] arguments) {
-        Bundle bundle = new Bundle();
-        for (ActionArgument arg : arguments) {
-            arg.putIn(bundle);
-        }
-        return bundle;
-    }
-
-    public boolean click() {
-        return performAction(ACTION_CLICK);
-    }
-
-    public boolean longClick() {
-        return performAction(ACTION_LONG_CLICK);
-    }
-
-    public boolean accessibilityFocus() {
-        return performAction(ACTION_ACCESSIBILITY_FOCUS);
-    }
-
-    public boolean clearAccessibilityFocus() {
-        return performAction(ACTION_CLEAR_ACCESSIBILITY_FOCUS);
-    }
-
-    public boolean focus() {
-        return performAction(ACTION_FOCUS);
-    }
-
-    public boolean clearFocus() {
-        return performAction(ACTION_CLEAR_FOCUS);
-    }
-
-    public boolean copy() {
-        return performAction(ACTION_COPY);
-    }
-
-    public boolean paste() {
-        return performAction(ACTION_PASTE);
-    }
-
-    public boolean select() {
-        return performAction(ACTION_SELECT);
-    }
-
-    public boolean cut() {
-        return performAction(ACTION_CUT);
-    }
-
-    public boolean collapse() {
-        return performAction(ACTION_COLLAPSE);
-    }
-
-    public boolean expand() {
-        return performAction(ACTION_EXPAND);
-    }
-
-    public boolean dismiss() {
-        return performAction(ACTION_DISMISS);
-    }
-
-    public boolean show() {
-        return performAction(ACTION_SHOW_ON_SCREEN.getId());
-    }
-
-    public boolean scrollForward() {
-        return performAction(ACTION_SCROLL_FORWARD);
-    }
-
-    public boolean scrollBackward() {
-        return performAction(ACTION_SCROLL_BACKWARD);
-    }
-
-    public boolean scrollUp() {
-        return performAction(ACTION_SCROLL_UP.getId());
-    }
-
-    public boolean scrollDown() {
-        return performAction(ACTION_SCROLL_DOWN.getId());
-    }
-
-    public boolean scrollLeft() {
-        return performAction(ACTION_SCROLL_LEFT.getId());
-    }
-
-    public boolean scrollRight() {
-        return performAction(ACTION_SCROLL_RIGHT.getId());
-    }
-
-    public boolean contextClick() {
-        return performAction(ACTION_CONTEXT_CLICK.getId());
-    }
-
-    public boolean setSelection(int s, int e) {
-        return performAction(ACTION_SET_SELECTION,
-                new ActionArgument.IntActionArgument(ACTION_ARGUMENT_SELECTION_START_INT, s),
-                new ActionArgument.IntActionArgument(ACTION_ARGUMENT_SELECTION_END_INT, e));
-    }
-
-    public boolean setText(String text) {
-        return performAction(ACTION_SET_TEXT,
-                new ActionArgument.CharSequenceActionArgument(ACTION_ARGUMENT_SET_TEXT_CHARSEQUENCE, text));
-    }
-
-    public boolean setProgress(float value) {
-        return performAction(ACTION_SET_PROGRESS.getId(),
-                new ActionArgument.FloatActionArgument(ACTION_ARGUMENT_PROGRESS_VALUE, value));
-    }
-
-    public boolean scrollTo(int row, int column) {
-        return performAction(ACTION_SCROLL_TO_POSITION.getId(),
-                new ActionArgument.IntActionArgument(ACTION_ARGUMENT_ROW_INT, row),
-                new ActionArgument.IntActionArgument(ACTION_ARGUMENT_COLUMN_INT, column));
-    }
-
-    @Override
-    public AccessibilityNodeInfoCompat getChild(int index) {
-        if (mAllocator == null)
-            return super.getChild(index);
-        return mAllocator.getChild(this, index);
-    }
-
-    @Override
-    public AccessibilityNodeInfoCompat getParent() {
-        if (mAllocator == null)
-            return super.getParent();
-        return mAllocator.getParent(this);
-    }
-
-
-    public boolean checkable() {
-        return isCheckable();
-    }
-
-
-    public boolean checked() {
-        return isChecked();
-    }
-
-
-    public boolean focusable() {
-        return isFocusable();
-    }
-
-
-    public boolean focused() {
-        return isFocused();
-    }
-
-
-    public boolean visibleToUser() {
-        return isVisibleToUser();
-    }
-
-
-    public boolean accessibilityFocused() {
-        return isAccessibilityFocused();
-    }
-
-
-    public boolean selected() {
-        return isSelected();
-    }
-
-    public boolean clickable() {
-        return isClickable();
-    }
-
-
-    public boolean longClickable() {
-        return isLongClickable();
-    }
-
-
-    public boolean enabled() {
-        return isEnabled();
-    }
-
-
-    public boolean password() {
-        return isPassword();
-    }
-
-
-    public boolean scrollable() {
-        return isScrollable();
-    }
-
-    public int row() {
-        return getCollectionItemInfo() == null ? -1 : getCollectionItemInfo().getRowIndex();
-    }
-
-    public int column() {
-        return getCollectionItemInfo() == null ? -1 : getCollectionItemInfo().getColumnIndex();
-    }
-
-    public int rowSpan() {
-        return getCollectionItemInfo() == null ? -1 : getCollectionItemInfo().getRowSpan();
-    }
-
-
-    public int columnSpan() {
-        return getCollectionItemInfo() == null ? -1 : getCollectionItemInfo().getColumnSpan();
-    }
-
-    public int rowCount() {
-        return getCollectionInfo() == null ? 0 : getCollectionInfo().getRowCount();
-    }
-
-
-    public int columnCount() {
-        return getCollectionInfo() == null ? 0 : getCollectionInfo().getColumnCount();
-    }
-
-    public boolean isHierarchically() {
-        return getCollectionInfo() != null && getCollectionInfo().isHierarchical();
-    }
-
-    @Override
-    public List<AccessibilityNodeInfoCompat> findAccessibilityNodeInfosByText(String text) {
-        if (mAllocator == null)
-            return super.findAccessibilityNodeInfosByText(text);
-        return mAllocator.findAccessibilityNodeInfosByText(this, text);
-    }
-
-    public List<UiObject> findByText(String text) {
-        return new UiGlobalSelector().textContains(text).findAndReturnList(this);
-    }
-
-    @Override
-    public List<AccessibilityNodeInfoCompat> findAccessibilityNodeInfosByViewId(String viewId) {
-        if (mAllocator == null)
-            return super.findAccessibilityNodeInfosByViewId(viewId);
-        return mAllocator.findAccessibilityNodeInfosByViewId(this, viewId);
-    }
-
-    public List<UiObject> findByViewId(String viewId) {
-        return new UiGlobalSelector().id(viewId).findAndReturnList(this);
-    }
-
-    @Override
-    public void recycle() {
-        try {
-            super.recycle();
-        } catch (Exception e) {
-            Log.w(TAG, mStackTrace, e);
-        }
-    }
-
-
-}
diff --git a/automator/src/main/java/com/stardust/automator/UiObject.kt b/automator/src/main/java/com/stardust/automator/UiObject.kt
new file mode 100644
index 00000000..03ba8e79
--- /dev/null
+++ b/automator/src/main/java/com/stardust/automator/UiObject.kt
@@ -0,0 +1,418 @@
+package com.stardust.automator
+
+import android.graphics.Rect
+import android.os.Bundle
+import androidx.core.view.accessibility.AccessibilityNodeInfoCompat
+import android.util.Log
+import android.view.accessibility.AccessibilityNodeInfo
+
+import com.stardust.view.accessibility.AccessibilityNodeInfoAllocator
+import com.stardust.view.accessibility.AccessibilityNodeInfoHelper
+
+import java.util.ArrayList
+import java.util.Arrays
+
+import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_CONTEXT_CLICK
+import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_SCROLL_DOWN
+import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_SCROLL_LEFT
+import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_SCROLL_RIGHT
+import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_SCROLL_TO_POSITION
+import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_SCROLL_UP
+import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_SET_PROGRESS
+import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_SHOW_ON_SCREEN
+
+/**
+ * Created by Stardust on 2017/3/9.
+ */
+
+open class UiObject(info: Any?, private val allocator: AccessibilityNodeInfoAllocator?, depth: Int, private val mIndexInParent: Int) : AccessibilityNodeInfoCompat(info) {
+
+
+    private var mStackTrace = ""
+    private var mDepth = 0
+
+    val isHierarchically: Boolean
+        get() = collectionInfo != null && collectionInfo.isHierarchical
+
+    init {
+        mDepth = depth
+        if (DEBUG)
+            mStackTrace = Arrays.toString(Thread.currentThread().stackTrace)
+
+    }
+
+
+    constructor(info: Any?, allocator: AccessibilityNodeInfoAllocator, indexInParent: Int) : this(info, allocator, 0, indexInParent) {}
+
+    @JvmOverloads
+    constructor(info: Any?, depth: Int = 0, indexInParent: Int = -1) : this(info, null, depth, indexInParent)
+
+    open fun parent(): UiObject? {
+        try {
+            val parent = super.getParent() ?: return null
+            return UiObject(parent.info, mDepth - 1, -1)
+        } catch (e: IllegalStateException) {
+            // FIXME: 2017/5/5
+            return null
+        }
+
+    }
+
+    open fun child(i: Int): UiObject? {
+        try {
+            val child = super.getChild(i) ?: return null
+            return UiObject(child.info, mDepth + 1, i)
+        } catch (e: IllegalStateException) {
+            // FIXME: 2017/5/5
+            return null
+        }
+
+    }
+
+    fun indexInParent(): Int {
+        return mIndexInParent
+    }
+
+    fun find(selector: UiGlobalSelector): UiObjectCollection {
+        return selector.findOf(this)
+    }
+
+    fun findOne(selector: UiGlobalSelector): UiObject? {
+        return selector.findOneOf(this)
+    }
+
+    fun children(): UiObjectCollection {
+        val list = ArrayList<UiObject?>(childCount)
+        for (i in 0 until childCount) {
+            list.add(child(i))
+        }
+        return UiObjectCollection.of(list)
+    }
+
+    open fun childCount(): Int {
+        return childCount
+    }
+
+    open fun bounds(): Rect {
+        return AccessibilityNodeInfoHelper.getBoundsInScreen(this)
+    }
+
+    open fun boundsInParent(): Rect {
+        return AccessibilityNodeInfoHelper.getBoundsInParent(this)
+    }
+
+    open fun drawingOrder(): Int {
+        return drawingOrder
+    }
+
+    open fun id(): String? {
+        return viewIdResourceName
+    }
+
+    open fun text(): String {
+        val t = text
+        return t?.toString() ?: ""
+    }
+
+    override fun getText(): CharSequence? {
+        return if (isPassword) {
+            ""
+        } else super.getText()
+    }
+
+    open fun desc(): String? {
+        val d = contentDescription
+        return d?.toString()
+    }
+
+    open fun className(): String? {
+        val d = className
+        return d?.toString()
+    }
+
+    open fun packageName(): String? {
+        val d = packageName
+        return d?.toString()
+    }
+
+    open fun depth(): Int {
+        return mDepth
+    }
+
+    fun performAction(action: Int, vararg arguments: ActionArgument): Boolean {
+        val bundle = argumentsToBundle(arguments)
+        return performAction(action, bundle)
+    }
+
+    override fun performAction(action: Int, bundle: Bundle): Boolean {
+        return try {
+            super.performAction(action, bundle)
+        } catch (e: IllegalStateException) {
+            // FIXME: 2017/5/5
+            false
+        }
+
+    }
+
+    override fun performAction(action: Int): Boolean {
+        return try {
+            super.performAction(action)
+        } catch (e: IllegalStateException) {
+            // FIXME: 2017/5/5
+            false
+        }
+    }
+
+    fun click(): Boolean {
+        return performAction(AccessibilityNodeInfoCompat.ACTION_CLICK)
+    }
+
+    fun longClick(): Boolean {
+        return performAction(AccessibilityNodeInfoCompat.ACTION_LONG_CLICK)
+    }
+
+    fun accessibilityFocus(): Boolean {
+        return performAction(AccessibilityNodeInfoCompat.ACTION_ACCESSIBILITY_FOCUS)
+    }
+
+    fun clearAccessibilityFocus(): Boolean {
+        return performAction(AccessibilityNodeInfoCompat.ACTION_CLEAR_ACCESSIBILITY_FOCUS)
+    }
+
+    fun focus(): Boolean {
+        return performAction(AccessibilityNodeInfoCompat.ACTION_FOCUS)
+    }
+
+    fun clearFocus(): Boolean {
+        return performAction(AccessibilityNodeInfoCompat.ACTION_CLEAR_FOCUS)
+    }
+
+    fun copy(): Boolean {
+        return performAction(AccessibilityNodeInfoCompat.ACTION_COPY)
+    }
+
+    fun paste(): Boolean {
+        return performAction(AccessibilityNodeInfoCompat.ACTION_PASTE)
+    }
+
+    fun select(): Boolean {
+        return performAction(AccessibilityNodeInfoCompat.ACTION_SELECT)
+    }
+
+    fun cut(): Boolean {
+        return performAction(AccessibilityNodeInfoCompat.ACTION_CUT)
+    }
+
+    fun collapse(): Boolean {
+        return performAction(AccessibilityNodeInfoCompat.ACTION_COLLAPSE)
+    }
+
+    fun expand(): Boolean {
+        return performAction(AccessibilityNodeInfoCompat.ACTION_EXPAND)
+    }
+
+    fun dismiss(): Boolean {
+        return performAction(AccessibilityNodeInfoCompat.ACTION_DISMISS)
+    }
+
+    fun show(): Boolean {
+        return performAction(ACTION_SHOW_ON_SCREEN.id)
+    }
+
+    fun scrollForward(): Boolean {
+        return performAction(AccessibilityNodeInfoCompat.ACTION_SCROLL_FORWARD)
+    }
+
+    fun scrollBackward(): Boolean {
+        return performAction(AccessibilityNodeInfoCompat.ACTION_SCROLL_BACKWARD)
+    }
+
+    fun scrollUp(): Boolean {
+        return performAction(ACTION_SCROLL_UP.id)
+    }
+
+    fun scrollDown(): Boolean {
+        return performAction(ACTION_SCROLL_DOWN.id)
+    }
+
+    fun scrollLeft(): Boolean {
+        return performAction(ACTION_SCROLL_LEFT.id)
+    }
+
+    fun scrollRight(): Boolean {
+        return performAction(ACTION_SCROLL_RIGHT.id)
+    }
+
+    fun contextClick(): Boolean {
+        return performAction(ACTION_CONTEXT_CLICK.id)
+    }
+
+    fun setSelection(s: Int, e: Int): Boolean {
+        return performAction(AccessibilityNodeInfoCompat.ACTION_SET_SELECTION,
+                ActionArgument.IntActionArgument(AccessibilityNodeInfoCompat.ACTION_ARGUMENT_SELECTION_START_INT, s),
+                ActionArgument.IntActionArgument(AccessibilityNodeInfoCompat.ACTION_ARGUMENT_SELECTION_END_INT, e))
+    }
+
+    fun setText(text: String): Boolean {
+        return performAction(AccessibilityNodeInfoCompat.ACTION_SET_TEXT,
+                ActionArgument.CharSequenceActionArgument(AccessibilityNodeInfoCompat.ACTION_ARGUMENT_SET_TEXT_CHARSEQUENCE, text))
+    }
+
+    fun setProgress(value: Float): Boolean {
+        return performAction(ACTION_SET_PROGRESS.id,
+                ActionArgument.FloatActionArgument(AccessibilityNodeInfoCompat.ACTION_ARGUMENT_PROGRESS_VALUE, value))
+    }
+
+    fun scrollTo(row: Int, column: Int): Boolean {
+        return performAction(ACTION_SCROLL_TO_POSITION.id,
+                ActionArgument.IntActionArgument(AccessibilityNodeInfoCompat.ACTION_ARGUMENT_ROW_INT, row),
+                ActionArgument.IntActionArgument(AccessibilityNodeInfoCompat.ACTION_ARGUMENT_COLUMN_INT, column))
+    }
+
+    override fun getChild(index: Int): AccessibilityNodeInfoCompat {
+        return if (allocator == null) super.getChild(index) else allocator.getChild(this, index)
+    }
+
+    override fun getParent(): AccessibilityNodeInfoCompat {
+        return if (allocator == null) super.getParent() else allocator.getParent(this)
+    }
+
+
+    open fun checkable(): Boolean {
+        return isCheckable
+    }
+
+
+    open fun checked(): Boolean {
+        return isChecked
+    }
+
+
+    open fun focusable(): Boolean {
+        return isFocusable
+    }
+
+
+    open fun focused(): Boolean {
+        return isFocused
+    }
+
+
+    open fun visibleToUser(): Boolean {
+        return isVisibleToUser
+    }
+
+
+    open fun accessibilityFocused(): Boolean {
+        return isAccessibilityFocused
+    }
+
+
+    open fun selected(): Boolean {
+        return isSelected
+    }
+
+    open fun clickable(): Boolean {
+        return isClickable
+    }
+
+
+    open fun longClickable(): Boolean {
+        return isLongClickable
+    }
+
+
+    open fun enabled(): Boolean {
+        return isEnabled
+    }
+
+
+    fun password(): Boolean {
+        return isPassword
+    }
+
+
+    open fun scrollable(): Boolean {
+        return isScrollable
+    }
+
+    open fun row(): Int {
+        return if (collectionItemInfo == null) -1 else collectionItemInfo.rowIndex
+    }
+
+    open fun column(): Int {
+        return if (collectionItemInfo == null) -1 else collectionItemInfo.columnIndex
+    }
+
+    open fun rowSpan(): Int {
+        return if (collectionItemInfo == null) -1 else collectionItemInfo.rowSpan
+    }
+
+
+    open fun columnSpan(): Int {
+        return if (collectionItemInfo == null) -1 else collectionItemInfo.columnSpan
+    }
+
+    open fun rowCount(): Int {
+        return if (collectionInfo == null) 0 else collectionInfo.rowCount
+    }
+
+
+    open fun columnCount(): Int {
+        return if (collectionInfo == null) 0 else collectionInfo.columnCount
+    }
+
+    override fun findAccessibilityNodeInfosByText(text: String): List<AccessibilityNodeInfoCompat> {
+        return allocator?.findAccessibilityNodeInfosByText(this, text)
+                ?: super.findAccessibilityNodeInfosByText(text)
+    }
+
+    fun findByText(text: String): List<UiObject> {
+        return UiGlobalSelector().textContains(text).findAndReturnList(this)
+    }
+
+    override fun findAccessibilityNodeInfosByViewId(viewId: String): List<AccessibilityNodeInfoCompat> {
+        return allocator?.findAccessibilityNodeInfosByViewId(this, viewId)
+                ?: super.findAccessibilityNodeInfosByViewId(viewId)
+    }
+
+    fun findByViewId(viewId: String): List<UiObject> {
+        return UiGlobalSelector().id(viewId).findAndReturnList(this)
+    }
+
+    override fun recycle() {
+        try {
+            super.recycle()
+        } catch (e: Exception) {
+            Log.w(TAG, mStackTrace, e)
+        }
+
+    }
+
+    companion object {
+
+        val ACTION_APPEND_TEXT = 0x00200001
+
+        private const val TAG = "UiObject"
+        private const val DEBUG = false
+
+
+        fun createRoot(root: AccessibilityNodeInfo): UiObject {
+            return UiObject(root, null, 0, -1)
+        }
+
+        fun createRoot(root: AccessibilityNodeInfo, allocator: AccessibilityNodeInfoAllocator?): UiObject {
+            return UiObject(root, allocator, 0, -1)
+        }
+
+        private fun argumentsToBundle(arguments: Array<out ActionArgument>): Bundle {
+            val bundle = Bundle()
+            for (arg in arguments) {
+                arg.putIn(bundle)
+            }
+            return bundle
+        }
+    }
+
+
+}
diff --git a/automator/src/main/java/com/stardust/automator/UiObjectCollection.java b/automator/src/main/java/com/stardust/automator/UiObjectCollection.java
deleted file mode 100644
index 8267603b..00000000
--- a/automator/src/main/java/com/stardust/automator/UiObjectCollection.java
+++ /dev/null
@@ -1,392 +0,0 @@
-package com.stardust.automator;
-
-import android.os.Build;
-import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.annotation.RequiresApi;
-
-import com.stardust.util.Consumer;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Iterator;
-import java.util.List;
-import java.util.ListIterator;
-import java.util.Spliterator;
-import java.util.function.Predicate;
-import java.util.function.UnaryOperator;
-import java.util.stream.Stream;
-
-import static android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.ACTION_ACCESSIBILITY_FOCUS;
-import static android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.ACTION_ARGUMENT_COLUMN_INT;
-import static android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.ACTION_ARGUMENT_PROGRESS_VALUE;
-import static android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.ACTION_ARGUMENT_ROW_INT;
-import static android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.ACTION_ARGUMENT_SELECTION_END_INT;
-import static android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.ACTION_ARGUMENT_SELECTION_START_INT;
-import static android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.ACTION_ARGUMENT_SET_TEXT_CHARSEQUENCE;
-import static android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.ACTION_CLEAR_ACCESSIBILITY_FOCUS;
-import static android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.ACTION_CLEAR_FOCUS;
-import static android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.ACTION_CLICK;
-import static android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.ACTION_COLLAPSE;
-import static android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.ACTION_COPY;
-import static android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.ACTION_CUT;
-import static android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.ACTION_DISMISS;
-import static android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.ACTION_EXPAND;
-import static android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.ACTION_FOCUS;
-import static android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.ACTION_LONG_CLICK;
-import static android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.ACTION_PASTE;
-import static android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.ACTION_SCROLL_BACKWARD;
-import static android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.ACTION_SCROLL_FORWARD;
-import static android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.ACTION_SELECT;
-import static android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.ACTION_SET_SELECTION;
-import static android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.ACTION_SET_TEXT;
-import static android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_CONTEXT_CLICK;
-import static android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_SCROLL_DOWN;
-import static android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_SCROLL_LEFT;
-import static android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_SCROLL_RIGHT;
-import static android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_SCROLL_TO_POSITION;
-import static android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_SCROLL_UP;
-import static android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_SET_PROGRESS;
-import static android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_SHOW_ON_SCREEN;
-
-/**
- * Created by Stardust on 2017/3/9.
- */
-
-public class UiObjectCollection implements List<UiObject> {
-
-    public static final UiObjectCollection EMPTY = UiObjectCollection.of(Collections.<UiObject>emptyList());
-
-    public static UiObjectCollection of(List<UiObject> list) {
-        return new UiObjectCollection(list);
-    }
-
-    private List<UiObject> mNodes;
-
-    private UiObjectCollection(List<UiObject> list) {
-        mNodes = list;
-    }
-
-    public UiObject[] toArray() {
-        return mNodes.toArray(new UiObject[0]);
-    }
-
-    @Override
-    public <T> T[] toArray(T[] a) {
-        return mNodes.toArray(a);
-    }
-
-    @Override
-    public boolean add(UiObject uiObject) {
-        return mNodes.add(uiObject);
-    }
-
-    @Override
-    public boolean remove(Object o) {
-        return mNodes.remove(o);
-    }
-
-    @Override
-    public boolean containsAll(Collection<?> c) {
-        return mNodes.containsAll(c);
-    }
-
-    @Override
-    public boolean addAll(Collection<? extends UiObject> c) {
-        return mNodes.addAll(c);
-    }
-
-    @Override
-    public boolean addAll(int index, Collection<? extends UiObject> c) {
-        return mNodes.addAll(index, c);
-    }
-
-    @Override
-    public boolean removeAll(Collection<?> c) {
-        return mNodes.removeAll(c);
-    }
-
-    @Override
-    public boolean retainAll(Collection<?> c) {
-        return mNodes.retainAll(c);
-    }
-
-    @RequiresApi(api = Build.VERSION_CODES.N)
-    @Override
-    public void replaceAll(UnaryOperator<UiObject> operator) {
-        mNodes.replaceAll(operator);
-    }
-
-    @RequiresApi(api = Build.VERSION_CODES.N)
-    @Override
-    public void sort(Comparator<? super UiObject> c) {
-        mNodes.sort(c);
-    }
-
-    @Override
-    public void clear() {
-        mNodes.clear();
-    }
-
-    public boolean performAction(int action) {
-        boolean fail = false;
-        for (UiObject node : mNodes) {
-            if (!node.performAction(action)) {
-                fail = true;
-            }
-        }
-        return !fail;
-    }
-
-    public boolean performAction(int action, ActionArgument... arguments) {
-        boolean fail = false;
-        Bundle bundle = argumentsToBundle(arguments);
-        for (UiObject node : mNodes) {
-            if (!node.performAction(action, bundle)) {
-                fail = true;
-            }
-        }
-        return !fail;
-    }
-
-    private Bundle argumentsToBundle(ActionArgument[] arguments) {
-        Bundle bundle = new Bundle();
-        for (ActionArgument arg : arguments) {
-            arg.putIn(bundle);
-        }
-        return bundle;
-    }
-
-    public boolean click() {
-        return performAction(ACTION_CLICK);
-    }
-
-    public boolean longClick() {
-        return performAction(ACTION_LONG_CLICK);
-    }
-
-    public boolean accessibilityFocus() {
-        return performAction(ACTION_ACCESSIBILITY_FOCUS);
-    }
-
-    public boolean clearAccessibilityFocus() {
-        return performAction(ACTION_CLEAR_ACCESSIBILITY_FOCUS);
-    }
-
-    public boolean focus() {
-        return performAction(ACTION_FOCUS);
-    }
-
-    public boolean clearFocus() {
-        return performAction(ACTION_CLEAR_FOCUS);
-    }
-
-    public boolean copy() {
-        return performAction(ACTION_COPY);
-    }
-
-    public boolean paste() {
-        return performAction(ACTION_PASTE);
-    }
-
-    public boolean select() {
-        return performAction(ACTION_SELECT);
-    }
-
-    public boolean cut() {
-        return performAction(ACTION_CUT);
-    }
-
-    public boolean collapse() {
-        return performAction(ACTION_COLLAPSE);
-    }
-
-    public boolean expand() {
-        return performAction(ACTION_EXPAND);
-    }
-
-    public boolean dismiss() {
-        return performAction(ACTION_DISMISS);
-    }
-
-    public boolean show() {
-        return performAction(ACTION_SHOW_ON_SCREEN.getId());
-    }
-
-    public boolean scrollForward() {
-        return performAction(ACTION_SCROLL_FORWARD);
-    }
-
-    public boolean scrollBackward() {
-        return performAction(ACTION_SCROLL_BACKWARD);
-    }
-
-    public boolean scrollUp() {
-        return performAction(ACTION_SCROLL_UP.getId());
-    }
-
-    public boolean scrollDown() {
-        return performAction(ACTION_SCROLL_DOWN.getId());
-    }
-
-    public boolean scrollLeft() {
-        return performAction(ACTION_SCROLL_LEFT.getId());
-    }
-
-    public boolean scrollRight() {
-        return performAction(ACTION_SCROLL_RIGHT.getId());
-    }
-
-    public boolean contextClick() {
-        return performAction(ACTION_CONTEXT_CLICK.getId());
-    }
-
-    public boolean setSelection(int s, int e) {
-        return performAction(ACTION_SET_SELECTION,
-                new ActionArgument.IntActionArgument(ACTION_ARGUMENT_SELECTION_START_INT, s),
-                new ActionArgument.IntActionArgument(ACTION_ARGUMENT_SELECTION_END_INT, e));
-    }
-
-    public boolean setText(CharSequence text) {
-        return performAction(ACTION_SET_TEXT,
-                new ActionArgument.CharSequenceActionArgument(ACTION_ARGUMENT_SET_TEXT_CHARSEQUENCE, text));
-    }
-
-    public boolean setProgress(float value) {
-        return performAction(ACTION_SET_PROGRESS.getId(),
-                new ActionArgument.FloatActionArgument(ACTION_ARGUMENT_PROGRESS_VALUE, value));
-
-    }
-
-    public boolean scrollTo(int row, int column) {
-        return performAction(ACTION_SCROLL_TO_POSITION.getId(),
-                new ActionArgument.IntActionArgument(ACTION_ARGUMENT_ROW_INT, row),
-                new ActionArgument.IntActionArgument(ACTION_ARGUMENT_COLUMN_INT, column));
-    }
-
-    public UiObject get(int i) {
-        return mNodes.get(i);
-    }
-
-    @Override
-    public UiObject set(int index, UiObject element) {
-        return mNodes.set(index, element);
-    }
-
-    @Override
-    public void add(int index, UiObject element) {
-        mNodes.add(index, element);
-    }
-
-    @Override
-    public UiObject remove(int index) {
-        return mNodes.remove(index);
-    }
-
-    @Override
-    public int indexOf(Object o) {
-        return mNodes.indexOf(o);
-    }
-
-    @Override
-    public int lastIndexOf(Object o) {
-        return mNodes.lastIndexOf(o);
-    }
-
-    @RequiresApi(api = Build.VERSION_CODES.N)
-    @Override
-    public ListIterator<UiObject> listIterator() {
-        return mNodes.listIterator();
-    }
-
-    @RequiresApi(api = Build.VERSION_CODES.N)
-    @Override
-    public ListIterator<UiObject> listIterator(int index) {
-        return mNodes.listIterator(index);
-    }
-
-    @RequiresApi(api = Build.VERSION_CODES.N)
-    @Override
-    public List<UiObject> subList(int fromIndex, int toIndex) {
-        return mNodes.subList(fromIndex, toIndex);
-    }
-
-    @RequiresApi(api = Build.VERSION_CODES.N)
-    @Override
-    public Spliterator<UiObject> spliterator() {
-        return mNodes.spliterator();
-    }
-
-    @RequiresApi(api = Build.VERSION_CODES.N)
-    @Override
-    public boolean removeIf(Predicate<? super UiObject> filter) {
-        return mNodes.removeIf(filter);
-    }
-
-    @RequiresApi(api = Build.VERSION_CODES.N)
-    @Override
-    public Stream<UiObject> stream() {
-        return mNodes.stream();
-    }
-
-    @RequiresApi(api = Build.VERSION_CODES.N)
-    @Override
-    public Stream<UiObject> parallelStream() {
-        return mNodes.parallelStream();
-    }
-
-    public int size() {
-        return mNodes.size();
-    }
-
-    @Override
-    public boolean isEmpty() {
-        return mNodes.isEmpty();
-    }
-
-    @Override
-    public boolean contains(Object o) {
-        return mNodes.contains(o);
-    }
-
-    @Override
-    public Iterator<UiObject> iterator() {
-        return mNodes.iterator();
-    }
-
-    public UiObjectCollection each(Consumer<UiObject> consumer) {
-        for (UiObject uiObject : mNodes) {
-            consumer.accept(uiObject);
-        }
-        return this;
-    }
-
-    public UiObjectCollection find(UiGlobalSelector selector) {
-        List<UiObject> list = new ArrayList<>();
-        for (UiObject object : mNodes) {
-            list.addAll(selector.findOf(object).mNodes);
-        }
-        return of(list);
-    }
-
-    @Nullable
-    public UiObject findOne(UiGlobalSelector selector) {
-        for (UiObject object : mNodes) {
-            UiObject result = selector.findOneOf(object);
-            if (result != null)
-                return result;
-        }
-        return null;
-    }
-
-    public boolean empty() {
-        return size() == 0;
-    }
-
-    public boolean nonEmpty() {
-        return size() != 0;
-    }
-
-}
diff --git a/automator/src/main/java/com/stardust/automator/UiObjectCollection.kt b/automator/src/main/java/com/stardust/automator/UiObjectCollection.kt
new file mode 100644
index 00000000..712cccfa
--- /dev/null
+++ b/automator/src/main/java/com/stardust/automator/UiObjectCollection.kt
@@ -0,0 +1,263 @@
+package com.stardust.automator
+
+import android.os.Bundle
+
+import com.stardust.util.Consumer
+
+import java.util.ArrayList
+import java.util.Collections
+
+import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_ACCESSIBILITY_FOCUS
+import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_ARGUMENT_COLUMN_INT
+import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_ARGUMENT_PROGRESS_VALUE
+import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_ARGUMENT_ROW_INT
+import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_ARGUMENT_SELECTION_END_INT
+import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_ARGUMENT_SELECTION_START_INT
+import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_ARGUMENT_SET_TEXT_CHARSEQUENCE
+import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_CLEAR_ACCESSIBILITY_FOCUS
+import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_CLEAR_FOCUS
+import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_CLICK
+import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_COLLAPSE
+import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_COPY
+import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_CUT
+import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_DISMISS
+import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_EXPAND
+import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_FOCUS
+import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_LONG_CLICK
+import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_PASTE
+import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_SCROLL_BACKWARD
+import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_SCROLL_FORWARD
+import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_SELECT
+import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_SET_SELECTION
+import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_SET_TEXT
+import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_CONTEXT_CLICK
+import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_SCROLL_DOWN
+import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_SCROLL_LEFT
+import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_SCROLL_RIGHT
+import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_SCROLL_TO_POSITION
+import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_SCROLL_UP
+import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_SET_PROGRESS
+import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_SHOW_ON_SCREEN
+
+/**
+ * Created by Stardust on 2017/3/9.
+ */
+
+class UiObjectCollection private constructor(private val mNodes: List<UiObject?>) {
+
+
+    val isEmpty: Boolean
+        get() = mNodes.isEmpty()
+
+    fun toArray(): Array<UiObject?> {
+        return mNodes.toTypedArray()
+    }
+
+    fun performAction(action: Int): Boolean {
+        var fail = false
+        for (node in mNodes) {
+            val succeed = node?.performAction(action) ?: false
+            if (!succeed) {
+                fail = true
+            }
+        }
+        return !fail
+    }
+
+    fun performAction(action: Int, vararg arguments: ActionArgument): Boolean {
+        var fail = false
+        val bundle = argumentsToBundle(arguments)
+        for (node in mNodes) {
+            val succeed = node?.performAction(action, bundle) ?: false
+            if (succeed) {
+                fail = true
+            }
+        }
+        return !fail
+    }
+
+    private fun argumentsToBundle(arguments: Array<out ActionArgument>): Bundle {
+        val bundle = Bundle()
+        for (arg in arguments) {
+            arg.putIn(bundle)
+        }
+        return bundle
+    }
+
+    fun click(): Boolean {
+        return performAction(ACTION_CLICK)
+    }
+
+    fun longClick(): Boolean {
+        return performAction(ACTION_LONG_CLICK)
+    }
+
+    fun accessibilityFocus(): Boolean {
+        return performAction(ACTION_ACCESSIBILITY_FOCUS)
+    }
+
+    fun clearAccessibilityFocus(): Boolean {
+        return performAction(ACTION_CLEAR_ACCESSIBILITY_FOCUS)
+    }
+
+    fun focus(): Boolean {
+        return performAction(ACTION_FOCUS)
+    }
+
+    fun clearFocus(): Boolean {
+        return performAction(ACTION_CLEAR_FOCUS)
+    }
+
+    fun copy(): Boolean {
+        return performAction(ACTION_COPY)
+    }
+
+    fun paste(): Boolean {
+        return performAction(ACTION_PASTE)
+    }
+
+    fun select(): Boolean {
+        return performAction(ACTION_SELECT)
+    }
+
+    fun cut(): Boolean {
+        return performAction(ACTION_CUT)
+    }
+
+    fun collapse(): Boolean {
+        return performAction(ACTION_COLLAPSE)
+    }
+
+    fun expand(): Boolean {
+        return performAction(ACTION_EXPAND)
+    }
+
+    fun dismiss(): Boolean {
+        return performAction(ACTION_DISMISS)
+    }
+
+    fun show(): Boolean {
+        return performAction(ACTION_SHOW_ON_SCREEN.id)
+    }
+
+    fun scrollForward(): Boolean {
+        return performAction(ACTION_SCROLL_FORWARD)
+    }
+
+    fun scrollBackward(): Boolean {
+        return performAction(ACTION_SCROLL_BACKWARD)
+    }
+
+    fun scrollUp(): Boolean {
+        return performAction(ACTION_SCROLL_UP.id)
+    }
+
+    fun scrollDown(): Boolean {
+        return performAction(ACTION_SCROLL_DOWN.id)
+    }
+
+    fun scrollLeft(): Boolean {
+        return performAction(ACTION_SCROLL_LEFT.id)
+    }
+
+    fun scrollRight(): Boolean {
+        return performAction(ACTION_SCROLL_RIGHT.id)
+    }
+
+    fun contextClick(): Boolean {
+        return performAction(ACTION_CONTEXT_CLICK.id)
+    }
+
+    fun setSelection(s: Int, e: Int): Boolean {
+        return performAction(ACTION_SET_SELECTION,
+                ActionArgument.IntActionArgument(ACTION_ARGUMENT_SELECTION_START_INT, s),
+                ActionArgument.IntActionArgument(ACTION_ARGUMENT_SELECTION_END_INT, e))
+    }
+
+    fun setText(text: CharSequence): Boolean {
+        return performAction(ACTION_SET_TEXT,
+                ActionArgument.CharSequenceActionArgument(ACTION_ARGUMENT_SET_TEXT_CHARSEQUENCE, text))
+    }
+
+    fun setProgress(value: Float): Boolean {
+        return performAction(ACTION_SET_PROGRESS.id,
+                ActionArgument.FloatActionArgument(ACTION_ARGUMENT_PROGRESS_VALUE, value))
+
+    }
+
+    fun scrollTo(row: Int, column: Int): Boolean {
+        return performAction(ACTION_SCROLL_TO_POSITION.id,
+                ActionArgument.IntActionArgument(ACTION_ARGUMENT_ROW_INT, row),
+                ActionArgument.IntActionArgument(ACTION_ARGUMENT_COLUMN_INT, column))
+    }
+
+    operator fun get(i: Int): UiObject? {
+        return mNodes[i]
+    }
+
+    fun indexOf(o: UiObject?): Int {
+        return mNodes.indexOf(o)
+    }
+
+
+    fun lastIndexOf(o: UiObject?): Int {
+        return mNodes.lastIndexOf(o)
+    }
+
+    fun size(): Int {
+        return mNodes.size
+    }
+
+
+    operator fun contains(o: UiObject?): Boolean {
+        return mNodes.contains(o)
+    }
+
+    operator fun iterator(): Iterator<UiObject?> {
+        return mNodes.iterator()
+    }
+
+    fun each(consumer: Consumer<UiObject>): UiObjectCollection {
+        for (uiObject in mNodes) {
+            consumer.accept(uiObject)
+        }
+        return this
+    }
+
+    fun find(selector: UiGlobalSelector): UiObjectCollection {
+        val list = ArrayList<UiObject?>()
+        for (`object` in mNodes) {
+            `object`?.let {
+                list.addAll(selector.findOf(it).mNodes)
+            }
+        }
+        return of(list)
+    }
+
+    fun findOne(selector: UiGlobalSelector): UiObject? {
+        for (`object` in mNodes) {
+            val result = `object`?.run { selector.findOneOf(this) }
+            if (result != null)
+                return result
+        }
+        return null
+    }
+
+    fun empty(): Boolean {
+        return size() == 0
+    }
+
+    fun nonEmpty(): Boolean {
+        return size() != 0
+    }
+
+    companion object {
+
+        val EMPTY = UiObjectCollection.of(emptyList())
+
+        fun of(list: List<UiObject?>): UiObjectCollection {
+            return UiObjectCollection(list)
+        }
+    }
+
+}
diff --git a/automator/src/main/java/com/stardust/automator/filter/BooleanFilter.java b/automator/src/main/java/com/stardust/automator/filter/BooleanFilter.java
deleted file mode 100644
index 627d8a0b..00000000
--- a/automator/src/main/java/com/stardust/automator/filter/BooleanFilter.java
+++ /dev/null
@@ -1,278 +0,0 @@
-package com.stardust.automator.filter;
-
-import android.os.Build;
-import android.support.annotation.RequiresApi;
-
-import com.stardust.automator.UiObject;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * Created by Stardust on 2017/3/9.
- */
-
-public class BooleanFilter extends DfsFilter {
-
-    private static Map<BooleanSupplier, BooleanFilter[]> cache = new HashMap<>();
-
-
-    public static BooleanFilter get(BooleanSupplier supplier, boolean b) {
-        BooleanFilter[] booleanFilters = cache.get(supplier);
-        if (booleanFilters == null) {
-            booleanFilters = new BooleanFilter[2];
-            cache.put(supplier, booleanFilters);
-        }
-        int i = b ? 1 : 0;
-        if (booleanFilters[i] == null) {
-            booleanFilters[i] = new BooleanFilter(supplier, b);
-        }
-        return booleanFilters[i];
-    }
-
-    public interface BooleanSupplier {
-
-        boolean get(UiObject node);
-
-    }
-
-    public static final BooleanSupplier CHECKABLE = new BooleanSupplier() {
-
-        @Override
-        public boolean get(UiObject node) {
-            return node.isCheckable();
-        }
-
-        @Override
-        public String toString() {
-            return "checkable";
-        }
-    };
-
-    public static final BooleanSupplier CHECKED = new BooleanSupplier() {
-
-        @Override
-        public boolean get(UiObject node) {
-            return node.isChecked();
-        }
-
-        @Override
-        public String toString() {
-            return "checked";
-        }
-    };
-
-    public static final BooleanSupplier FOCUSABLE = new BooleanSupplier() {
-
-        @Override
-        public boolean get(UiObject node) {
-            return node.isFocusable();
-        }
-
-        @Override
-        public String toString() {
-            return "focusable";
-        }
-    };
-
-    public static final BooleanSupplier FOCUSED = new BooleanSupplier() {
-
-        @Override
-        public boolean get(UiObject node) {
-            return node.isFocused();
-        }
-
-        @Override
-        public String toString() {
-            return "focused";
-        }
-    };
-
-    public static final BooleanSupplier VISIBLE_TO_USER = new BooleanSupplier() {
-
-        @Override
-        public boolean get(UiObject node) {
-            return node.isVisibleToUser();
-        }
-
-        @Override
-        public String toString() {
-            return "visibleToUser";
-        }
-    };
-
-    public static final BooleanSupplier ACCESSIBILITY_FOCUSED = new BooleanSupplier() {
-
-        @Override
-        public boolean get(UiObject node) {
-            return node.isAccessibilityFocused();
-        }
-
-        @Override
-        public String toString() {
-            return "accessibilityFocused";
-        }
-    };
-
-    public static final BooleanSupplier SELECTED = new BooleanSupplier() {
-
-        @Override
-        public boolean get(UiObject node) {
-            return node.isSelected();
-        }
-
-        @Override
-        public String toString() {
-            return "selected";
-        }
-    };
-
-    public static final BooleanSupplier CLICKABLE = new BooleanSupplier() {
-
-        @Override
-        public boolean get(UiObject node) {
-            return node.isClickable();
-        }
-
-        @Override
-        public String toString() {
-            return "clickable";
-        }
-    };
-
-    public static final BooleanSupplier LONG_CLICKABLE = new BooleanSupplier() {
-
-        @Override
-        public boolean get(UiObject node) {
-            return node.isLongClickable();
-        }
-
-        @Override
-        public String toString() {
-            return "longClickable";
-        }
-    };
-
-    public static final BooleanSupplier ENABLED = new BooleanSupplier() {
-
-        @Override
-        public boolean get(UiObject node) {
-            return node.isEnabled();
-        }
-
-        @Override
-        public String toString() {
-            return "enabled";
-        }
-    };
-
-
-    public static final BooleanSupplier PASSWORD = new BooleanSupplier() {
-
-        @Override
-        public boolean get(UiObject node) {
-            return node.isPassword();
-        }
-
-        @Override
-        public String toString() {
-            return "password";
-        }
-    };
-
-    public static final BooleanSupplier SCROLLABLE = new BooleanSupplier() {
-
-        @Override
-        public boolean get(UiObject node) {
-            return node.isScrollable();
-        }
-
-        @Override
-        public String toString() {
-            return "scrollable";
-        }
-    };
-
-    public static final BooleanSupplier EDITABLE = new BooleanSupplier() {
-
-        @Override
-        public boolean get(UiObject node) {
-            return node.isEditable();
-        }
-
-        @Override
-        public String toString() {
-            return "editable";
-        }
-    };
-    public static final BooleanSupplier CONTENT_INVALID = new BooleanSupplier() {
-
-        @Override
-        public boolean get(UiObject node) {
-            return node.isContentInvalid();
-        }
-
-        @Override
-        public String toString() {
-            return "contentInvalid";
-        }
-    };
-
-    public static final BooleanSupplier CONTEXT_CLICKABLE = new BooleanSupplier() {
-
-        @RequiresApi(api = Build.VERSION_CODES.M)
-        @Override
-        public boolean get(UiObject node) {
-            return node.isContextClickable();
-        }
-
-        @Override
-        public String toString() {
-            return "checkable";
-        }
-    };
-
-    public static final BooleanSupplier MULTI_LINE = new BooleanSupplier() {
-
-        @Override
-        public boolean get(UiObject node) {
-            return node.isMultiLine();
-        }
-
-        @Override
-        public String toString() {
-            return "multiLine";
-        }
-    };
-
-    public static final BooleanSupplier DISMISSABLE = new BooleanSupplier() {
-
-        @Override
-        public boolean get(UiObject node) {
-            return node.isDismissable();
-        }
-
-        @Override
-        public String toString() {
-            return "dismissable";
-        }
-    };
-
-    private BooleanSupplier mBooleanSupplier;
-    private boolean mExceptedValue;
-
-    public BooleanFilter(BooleanSupplier booleanSupplier, boolean exceptedValue) {
-        mBooleanSupplier = booleanSupplier;
-        mExceptedValue = exceptedValue;
-    }
-
-    @Override
-    protected boolean isIncluded(UiObject nodeInfo) {
-        return nodeInfo != null && mBooleanSupplier.get(nodeInfo) == mExceptedValue;
-    }
-
-    @Override
-    public String toString() {
-        return mBooleanSupplier.toString() + "(" + mExceptedValue + ")";
-    }
-}
diff --git a/automator/src/main/java/com/stardust/automator/filter/BooleanFilter.kt b/automator/src/main/java/com/stardust/automator/filter/BooleanFilter.kt
new file mode 100644
index 00000000..dea6c533
--- /dev/null
+++ b/automator/src/main/java/com/stardust/automator/filter/BooleanFilter.kt
@@ -0,0 +1,234 @@
+package com.stardust.automator.filter
+
+import android.os.Build
+import androidx.annotation.RequiresApi
+
+import com.stardust.automator.UiObject
+
+import java.util.HashMap
+
+/**
+ * Created by Stardust on 2017/3/9.
+ */
+
+class BooleanFilter(private val mBooleanSupplier: BooleanSupplier, private val mExceptedValue: Boolean) : Filter {
+
+    interface BooleanSupplier {
+
+        operator fun get(node: UiObject): Boolean
+
+    }
+
+    override fun filter(node: UiObject): Boolean {
+        return mBooleanSupplier[node] == mExceptedValue
+    }
+
+    override fun toString(): String {
+        return mBooleanSupplier.toString() + "(" + mExceptedValue + ")"
+    }
+
+    companion object {
+
+        private val cache = HashMap<BooleanSupplier, Array<BooleanFilter>>()
+
+        operator fun get(supplier: BooleanSupplier, b: Boolean): BooleanFilter {
+            var booleanFilters: Array<BooleanFilter>? = cache[supplier]
+            if (booleanFilters == null) {
+                booleanFilters = Array(2) {
+                    BooleanFilter(supplier, it != 0)
+                }
+                cache[supplier] = booleanFilters
+            }
+            val i = if (b) 1 else 0
+            return booleanFilters[i]
+        }
+
+        val CHECKABLE: BooleanSupplier = object : BooleanSupplier {
+
+            override fun get(node: UiObject): Boolean {
+                return node.isCheckable
+            }
+
+            override fun toString(): String {
+                return "checkable"
+            }
+        }
+
+        val CHECKED: BooleanSupplier = object : BooleanSupplier {
+
+            override fun get(node: UiObject): Boolean {
+                return node.isChecked
+            }
+
+            override fun toString(): String {
+                return "checked"
+            }
+        }
+
+        val FOCUSABLE: BooleanSupplier = object : BooleanSupplier {
+
+            override fun get(node: UiObject): Boolean {
+                return node.isFocusable
+            }
+
+            override fun toString(): String {
+                return "focusable"
+            }
+        }
+
+        val FOCUSED: BooleanSupplier = object : BooleanSupplier {
+
+            override fun get(node: UiObject): Boolean {
+                return node.isFocused
+            }
+
+            override fun toString(): String {
+                return "focused"
+            }
+        }
+
+        val VISIBLE_TO_USER: BooleanSupplier = object : BooleanSupplier {
+
+            override fun get(node: UiObject): Boolean {
+                return node.isVisibleToUser
+            }
+
+            override fun toString(): String {
+                return "visibleToUser"
+            }
+        }
+
+        val ACCESSIBILITY_FOCUSED: BooleanSupplier = object : BooleanSupplier {
+
+            override fun get(node: UiObject): Boolean {
+                return node.isAccessibilityFocused
+            }
+
+            override fun toString(): String {
+                return "accessibilityFocused"
+            }
+        }
+
+        val SELECTED: BooleanSupplier = object : BooleanSupplier {
+
+            override fun get(node: UiObject): Boolean {
+                return node.isSelected
+            }
+
+            override fun toString(): String {
+                return "selected"
+            }
+        }
+
+        val CLICKABLE: BooleanSupplier = object : BooleanSupplier {
+
+            override fun get(node: UiObject): Boolean {
+                return node.isClickable
+            }
+
+            override fun toString(): String {
+                return "clickable"
+            }
+        }
+
+        val LONG_CLICKABLE: BooleanSupplier = object : BooleanSupplier {
+
+            override fun get(node: UiObject): Boolean {
+                return node.isLongClickable
+            }
+
+            override fun toString(): String {
+                return "longClickable"
+            }
+        }
+
+        val ENABLED: BooleanSupplier = object : BooleanSupplier {
+
+            override fun get(node: UiObject): Boolean {
+                return node.isEnabled
+            }
+
+            override fun toString(): String {
+                return "enabled"
+            }
+        }
+
+
+        val PASSWORD: BooleanSupplier = object : BooleanSupplier {
+
+            override fun get(node: UiObject): Boolean {
+                return node.isPassword
+            }
+
+            override fun toString(): String {
+                return "password"
+            }
+        }
+
+        val SCROLLABLE: BooleanSupplier = object : BooleanSupplier {
+
+            override fun get(node: UiObject): Boolean {
+                return node.isScrollable
+            }
+
+            override fun toString(): String {
+                return "scrollable"
+            }
+        }
+
+        val EDITABLE: BooleanSupplier = object : BooleanSupplier {
+
+            override fun get(node: UiObject): Boolean {
+                return node.isEditable
+            }
+
+            override fun toString(): String {
+                return "editable"
+            }
+        }
+        val CONTENT_INVALID: BooleanSupplier = object : BooleanSupplier {
+
+            override fun get(node: UiObject): Boolean {
+                return node.isContentInvalid
+            }
+
+            override fun toString(): String {
+                return "contentInvalid"
+            }
+        }
+
+        val CONTEXT_CLICKABLE: BooleanSupplier = object : BooleanSupplier {
+
+            @RequiresApi(api = Build.VERSION_CODES.M)
+            override fun get(node: UiObject): Boolean {
+                return node.isContextClickable
+            }
+
+            override fun toString(): String {
+                return "checkable"
+            }
+        }
+
+        val MULTI_LINE: BooleanSupplier = object : BooleanSupplier {
+
+            override fun get(node: UiObject): Boolean {
+                return node.isMultiLine
+            }
+
+            override fun toString(): String {
+                return "multiLine"
+            }
+        }
+
+        val DISMISSABLE: BooleanSupplier = object : BooleanSupplier {
+
+            override fun get(node: UiObject): Boolean {
+                return node.isDismissable
+            }
+
+            override fun toString(): String {
+                return "dismissable"
+            }
+        }
+    }
+}
diff --git a/automator/src/main/java/com/stardust/automator/filter/BoundsFilter.java b/automator/src/main/java/com/stardust/automator/filter/BoundsFilter.java
deleted file mode 100644
index 1b243fec..00000000
--- a/automator/src/main/java/com/stardust/automator/filter/BoundsFilter.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package com.stardust.automator.filter;
-
-import android.graphics.Rect;
-
-import com.stardust.automator.UiObject;
-import com.stardust.view.accessibility.AccessibilityNodeInfoHelper;
-
-import java.util.Locale;
-
-/**
- * Created by Stardust on 2017/3/9.
- */
-
-public class BoundsFilter extends DfsFilter {
-
-    public static final int TYPE_EQUALS = 0;
-    public static final int TYPE_INSIDE = 1;
-    public static final int TYPE_CONTAINS = 2;
-
-    private Rect mBounds;
-    private int mType;
-
-    public BoundsFilter(Rect bounds, int type) {
-        mBounds = bounds;
-        mType = type;
-    }
-
-    @Override
-    protected boolean isIncluded(UiObject nodeInfo) {
-        if (mType == TYPE_CONTAINS) {
-            return AccessibilityNodeInfoHelper.getBoundsInScreen(nodeInfo).contains(mBounds);
-        }
-        Rect boundsInScreen = AccessibilityNodeInfoHelper.getBoundsInScreen(nodeInfo);
-        if (mType == TYPE_EQUALS)
-            return boundsInScreen.equals(mBounds);
-        return mBounds.contains(boundsInScreen);
-    }
-
-    @Override
-    public String toString() {
-        return String.format(Locale.getDefault(), "bounds%s(%d, %d, %d, %d)", mType == TYPE_EQUALS ? "" :
-                        mType == TYPE_INSIDE ? "Inside" : "Contains",
-                mBounds.left, mBounds.top, mBounds.right, mBounds.bottom);
-    }
-}
diff --git a/automator/src/main/java/com/stardust/automator/filter/BoundsFilter.kt b/automator/src/main/java/com/stardust/automator/filter/BoundsFilter.kt
new file mode 100644
index 00000000..1a351e2f
--- /dev/null
+++ b/automator/src/main/java/com/stardust/automator/filter/BoundsFilter.kt
@@ -0,0 +1,39 @@
+package com.stardust.automator.filter
+
+import android.graphics.Rect
+
+import com.stardust.automator.UiObject
+import com.stardust.view.accessibility.AccessibilityNodeInfoHelper
+
+import java.util.Locale
+
+/**
+ * Created by Stardust on 2017/3/9.
+ */
+
+class BoundsFilter(private val mBounds: Rect, private val mType: Int) : Filter {
+
+    override fun filter(node: UiObject): Boolean {
+        if (mType == TYPE_CONTAINS) {
+            return AccessibilityNodeInfoHelper.getBoundsInScreen(node).contains(mBounds)
+        }
+        val boundsInScreen = AccessibilityNodeInfoHelper.getBoundsInScreen(node)
+        return if (mType == TYPE_EQUALS) boundsInScreen == mBounds else mBounds.contains(boundsInScreen)
+    }
+
+    override fun toString(): String {
+        return String.format(Locale.getDefault(), "bounds%s(%d, %d, %d, %d)", when (mType) {
+            TYPE_EQUALS -> ""
+            TYPE_INSIDE -> "Inside"
+            else -> "Contains"
+        },
+                mBounds.left, mBounds.top, mBounds.right, mBounds.bottom)
+    }
+
+    companion object {
+
+        const val TYPE_EQUALS = 0
+        const val TYPE_INSIDE = 1
+        const val TYPE_CONTAINS = 2
+    }
+}
diff --git a/automator/src/main/java/com/stardust/automator/filter/ClassNameFilter.java b/automator/src/main/java/com/stardust/automator/filter/ClassNameFilter.java
deleted file mode 100644
index 611646ff..00000000
--- a/automator/src/main/java/com/stardust/automator/filter/ClassNameFilter.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package com.stardust.automator.filter;
-
-import com.stardust.automator.UiObject;
-
-/**
- * Created by Stardust on 2017/3/9.
- */
-
-public class ClassNameFilter {
-
-    private static final KeyGetter CLASS_NAME_GETTER = new KeyGetter() {
-        @Override
-        public String getKey(UiObject nodeInfo) {
-            CharSequence charSequence = nodeInfo.getClassName();
-            return charSequence == null ? null : charSequence.toString();
-        }
-
-        @Override
-        public String toString() {
-            return "className";
-        }
-    };
-
-    public static ListFilter equals(String text) {
-        if (!text.contains(".")) {
-            text = "android.widget." + text;
-        }
-        return new StringEqualsFilter(text, CLASS_NAME_GETTER);
-    }
-
-    public static ListFilter contains(String str) {
-        return new StringContainsFilter(str, CLASS_NAME_GETTER);
-    }
-
-    public static ListFilter startsWith(String prefix) {
-        return new StringStartsWithFilter(prefix, CLASS_NAME_GETTER);
-    }
-
-    public static ListFilter endsWith(String suffix) {
-        return new StringEndsWithFilter(suffix, CLASS_NAME_GETTER);
-    }
-
-    public static ListFilter matches(String regex) {
-        return new StringMatchesFilter(regex, CLASS_NAME_GETTER);
-    }
-
-    private ClassNameFilter() {
-
-    }
-}
diff --git a/automator/src/main/java/com/stardust/automator/filter/ClassNameFilters.kt b/automator/src/main/java/com/stardust/automator/filter/ClassNameFilters.kt
new file mode 100644
index 00000000..1b4de4c6
--- /dev/null
+++ b/automator/src/main/java/com/stardust/automator/filter/ClassNameFilters.kt
@@ -0,0 +1,45 @@
+package com.stardust.automator.filter
+
+import com.stardust.automator.UiObject
+
+/**
+ * Created by Stardust on 2017/3/9.
+ */
+
+object ClassNameFilters {
+
+    private val CLASS_NAME_GETTER = object : KeyGetter {
+        override fun getKey(nodeInfo: UiObject): String? {
+            val charSequence = nodeInfo.className
+            return charSequence?.toString()
+        }
+
+        override fun toString(): String {
+            return "className"
+        }
+    }
+
+    fun equals(text: String): Filter {
+        var className = text
+        if (!className.contains(".")) {
+            className = "android.widget.$className"
+        }
+        return StringEqualsFilter(className, CLASS_NAME_GETTER)
+    }
+
+    fun contains(str: String): Filter {
+        return StringContainsFilter(str, CLASS_NAME_GETTER)
+    }
+
+    fun startsWith(prefix: String): Filter {
+        return StringStartsWithFilter(prefix, CLASS_NAME_GETTER)
+    }
+
+    fun endsWith(suffix: String): Filter {
+        return StringEndsWithFilter(suffix, CLASS_NAME_GETTER)
+    }
+
+    fun matches(regex: String): Filter {
+        return StringMatchesFilter(regex, CLASS_NAME_GETTER)
+    }
+}
diff --git a/automator/src/main/java/com/stardust/automator/filter/DescFilter.java b/automator/src/main/java/com/stardust/automator/filter/DescFilter.java
deleted file mode 100644
index 92517644..00000000
--- a/automator/src/main/java/com/stardust/automator/filter/DescFilter.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.stardust.automator.filter;
-
-import com.stardust.automator.UiObject;
-
-/**
- * Created by Stardust on 2017/3/9.
- */
-
-public class DescFilter {
-
-    private static final KeyGetter DESC_GETTER = new KeyGetter() {
-        @Override
-        public String getKey(UiObject nodeInfo) {
-            CharSequence charSequence = nodeInfo.getContentDescription();
-            return charSequence == null ? null : charSequence.toString();
-        }
-
-        @Override
-        public String toString() {
-            return "desc";
-        }
-    };
-
-    public static ListFilter equals(String text) {
-        return new StringEqualsFilter(text, DESC_GETTER);
-    }
-
-    public static ListFilter contains(String str) {
-        return new StringContainsFilter(str, DESC_GETTER);
-    }
-
-    public static ListFilter startsWith(String prefix) {
-        return new StringStartsWithFilter(prefix, DESC_GETTER);
-    }
-
-    public static ListFilter endsWith(String suffix) {
-        return new StringEndsWithFilter(suffix, DESC_GETTER);
-    }
-    public static ListFilter matches(String regex) {
-        return new StringMatchesFilter(regex, DESC_GETTER);
-    }
-
-    private DescFilter(){
-
-    }
-}
diff --git a/automator/src/main/java/com/stardust/automator/filter/DescFilters.kt b/automator/src/main/java/com/stardust/automator/filter/DescFilters.kt
new file mode 100644
index 00000000..6cf29e1a
--- /dev/null
+++ b/automator/src/main/java/com/stardust/automator/filter/DescFilters.kt
@@ -0,0 +1,41 @@
+package com.stardust.automator.filter
+
+import com.stardust.automator.UiObject
+
+/**
+ * Created by Stardust on 2017/3/9.
+ */
+
+object DescFilters {
+
+    private val DESC_GETTER = object : KeyGetter {
+        override fun getKey(nodeInfo: UiObject): String? {
+            val charSequence = nodeInfo.contentDescription
+            return charSequence?.toString()
+        }
+
+        override fun toString(): String {
+            return "desc"
+        }
+    }
+
+    fun equals(text: String): Filter {
+        return StringEqualsFilter(text, DESC_GETTER)
+    }
+
+    fun contains(str: String): Filter {
+        return StringContainsFilter(str, DESC_GETTER)
+    }
+
+    fun startsWith(prefix: String): Filter {
+        return StringStartsWithFilter(prefix, DESC_GETTER)
+    }
+
+    fun endsWith(suffix: String): Filter {
+        return StringEndsWithFilter(suffix, DESC_GETTER)
+    }
+
+    fun matches(regex: String): Filter {
+        return StringMatchesFilter(regex, DESC_GETTER)
+    }
+}
diff --git a/automator/src/main/java/com/stardust/automator/filter/DfsFilter.java b/automator/src/main/java/com/stardust/automator/filter/DfsFilter.java
deleted file mode 100644
index d87a1c75..00000000
--- a/automator/src/main/java/com/stardust/automator/filter/DfsFilter.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package com.stardust.automator.filter;
-
-import com.stardust.automator.UiObject;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Created by Stardust on 2017/3/9.
- */
-
-public abstract class DfsFilter implements ListFilter, Filter {
-
-    @Override
-    public List<UiObject> filter(List<UiObject> nodes) {
-        ArrayList<UiObject> list = new ArrayList<>();
-        for (UiObject node : nodes) {
-            if (isIncluded(node)) {
-                list.add(node);
-            }
-            filterChildren(node, list);
-        }
-        return list;
-    }
-
-    public List<UiObject> filter(UiObject node) {
-        ArrayList<UiObject> list = new ArrayList<>();
-        if (isIncluded(node)) {
-            list.add(node);
-        }
-        filterChildren(node, list);
-        return list;
-    }
-
-    private void filterChildren(UiObject parent, List<UiObject> list) {
-        for (int i = 0; i < parent.getChildCount(); i++) {
-            UiObject child = parent.child(i);
-            if (child == null)
-                continue;
-            boolean included = isIncluded(child);
-            if (included) {
-                list.add(child);
-            }
-            filterChildren(child, list);
-            if (!included) {
-                child.recycle();
-            }
-        }
-    }
-
-    protected abstract boolean isIncluded(UiObject nodeInfo);
-}
diff --git a/automator/src/main/java/com/stardust/automator/filter/Filter.java b/automator/src/main/java/com/stardust/automator/filter/Filter.java
deleted file mode 100644
index 6ca42fc1..00000000
--- a/automator/src/main/java/com/stardust/automator/filter/Filter.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.stardust.automator.filter;
-
-import com.stardust.automator.UiObject;
-
-import java.util.List;
-
-/**
- * Created by Stardust on 2017/3/9.
- */
-
-public interface Filter {
-
-    List<UiObject> filter(UiObject node);
-
-}
diff --git a/automator/src/main/java/com/stardust/automator/filter/Filter.kt b/automator/src/main/java/com/stardust/automator/filter/Filter.kt
new file mode 100644
index 00000000..53804119
--- /dev/null
+++ b/automator/src/main/java/com/stardust/automator/filter/Filter.kt
@@ -0,0 +1,13 @@
+package com.stardust.automator.filter
+
+import com.stardust.automator.UiObject
+
+/**
+ * Created by Stardust on 2017/3/9.
+ */
+
+interface Filter {
+
+    fun filter(node: UiObject): Boolean
+
+}
diff --git a/automator/src/main/java/com/stardust/automator/filter/IdFilter.java b/automator/src/main/java/com/stardust/automator/filter/IdFilter.java
deleted file mode 100644
index 36f67f5f..00000000
--- a/automator/src/main/java/com/stardust/automator/filter/IdFilter.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.stardust.automator.filter;
-
-import com.stardust.automator.UiObject;
-
-import java.util.List;
-
-/**
- * Created by Stardust on 2017/3/9.
- */
-
-public class IdFilter {
-
-    public interface FullIdGetter {
-        String getFullId(String id);
-    }
-
-    private static final KeyGetter ID_GETTER = new KeyGetter() {
-
-        @Override
-        public String getKey(UiObject nodeInfo) {
-            return nodeInfo.getViewIdResourceName();
-        }
-
-        @Override
-        public String toString() {
-            return "id";
-        }
-    };
-
-    public static StringEqualsFilter equals(String id) {
-        return new StringEqualsFilter(id, ID_GETTER);
-    }
-    public static StringStartsWithFilter startsWith(String prefix) {
-        return new StringStartsWithFilter(prefix, ID_GETTER);
-    }
-
-    public static ListFilter endsWith(String suffix) {
-        return new StringEndsWithFilter(suffix, ID_GETTER);
-    }
-
-    public static StringContainsFilter contains(String contains) {
-        return new StringContainsFilter(contains, ID_GETTER);
-    }
-
-    public static StringMatchesFilter matches(String regex) {
-        return new StringMatchesFilter(regex, ID_GETTER);
-    }
-
-}
diff --git a/automator/src/main/java/com/stardust/automator/filter/IdFilter.kt b/automator/src/main/java/com/stardust/automator/filter/IdFilter.kt
new file mode 100644
index 00000000..4592cb46
--- /dev/null
+++ b/automator/src/main/java/com/stardust/automator/filter/IdFilter.kt
@@ -0,0 +1,42 @@
+package com.stardust.automator.filter
+
+import com.stardust.automator.UiObject
+
+/**
+ * Created by Stardust on 2017/3/9.
+ */
+
+object IdFilter {
+
+    private val ID_GETTER = object : KeyGetter {
+
+        override fun getKey(nodeInfo: UiObject): String? {
+            return nodeInfo.viewIdResourceName
+        }
+
+        override fun toString(): String {
+            return "id"
+        }
+    }
+
+    fun equals(id: String): StringEqualsFilter {
+        return StringEqualsFilter(id, ID_GETTER)
+    }
+
+    fun startsWith(prefix: String): StringStartsWithFilter {
+        return StringStartsWithFilter(prefix, ID_GETTER)
+    }
+
+    fun endsWith(suffix: String): StringEndsWithFilter {
+        return StringEndsWithFilter(suffix, ID_GETTER)
+    }
+
+    fun contains(contains: String): StringContainsFilter {
+        return StringContainsFilter(contains, ID_GETTER)
+    }
+
+    fun matches(regex: String): StringMatchesFilter {
+        return StringMatchesFilter(regex, ID_GETTER)
+    }
+
+}
diff --git a/automator/src/main/java/com/stardust/automator/filter/IntFilter.java b/automator/src/main/java/com/stardust/automator/filter/IntFilter.java
deleted file mode 100644
index 18d59dd7..00000000
--- a/automator/src/main/java/com/stardust/automator/filter/IntFilter.java
+++ /dev/null
@@ -1,128 +0,0 @@
-package com.stardust.automator.filter;
-
-import com.stardust.automator.UiObject;
-
-/**
- * Created by Stardust on 2017/11/5.
- */
-
-public class IntFilter extends DfsFilter {
-
-    public interface IntProperty {
-        int get(UiObject object);
-    }
-
-    public static final IntProperty DEPTH = new IntProperty() {
-        @Override
-        public int get(UiObject object) {
-            return object.depth();
-        }
-
-        @Override
-        public String toString() {
-            return "depth";
-        }
-    };
-
-    public static final IntProperty ROW = new IntProperty() {
-        @Override
-        public int get(UiObject object) {
-            return object.row();
-        }
-
-        @Override
-        public String toString() {
-            return "row";
-        }
-    };
-
-    public static final IntProperty ROW_COUNT = new IntProperty() {
-        @Override
-        public int get(UiObject object) {
-            return object.rowCount();
-        }
-
-        @Override
-        public String toString() {
-            return "rowCount";
-        }
-    };
-
-    public static final IntProperty ROW_SPAN = new IntProperty() {
-        @Override
-        public int get(UiObject object) {
-            return object.rowSpan();
-        }
-
-        @Override
-        public String toString() {
-            return "rowSpan";
-        }
-    };
-
-    public static final IntProperty COLUMN = new IntProperty() {
-        @Override
-        public int get(UiObject object) {
-            return object.column();
-        }
-
-        @Override
-        public String toString() {
-            return "column";
-        }
-    };
-
-    public static final IntProperty COLUMN_COUNT = new IntProperty() {
-        @Override
-        public int get(UiObject object) {
-            return object.columnCount();
-        }
-
-        @Override
-        public String toString() {
-            return "columnCount";
-        }
-    };
-
-    public static final IntProperty COLUMN_SPAN = new IntProperty() {
-        @Override
-        public int get(UiObject object) {
-            return object.columnSpan();
-        }
-
-        @Override
-        public String toString() {
-            return "columnSpan";
-        }
-    };
-
-    public static final IntProperty INDEX_IN_PARENT = new IntProperty() {
-        @Override
-        public int get(UiObject object) {
-            return object.indexInParent();
-        }
-
-        @Override
-        public String toString() {
-            return "indexInParent";
-        }
-    };
-
-    private IntProperty mIntProperty;
-    private int mValue;
-
-    public IntFilter(IntProperty intProperty, int value) {
-        mIntProperty = intProperty;
-        mValue = value;
-    }
-
-    @Override
-    protected boolean isIncluded(UiObject nodeInfo) {
-        return mIntProperty.get(nodeInfo) == mValue;
-    }
-
-    @Override
-    public String toString() {
-        return mIntProperty.toString() + "(" + mValue + ")";
-    }
-}
diff --git a/automator/src/main/java/com/stardust/automator/filter/IntFilter.kt b/automator/src/main/java/com/stardust/automator/filter/IntFilter.kt
new file mode 100644
index 00000000..638ed761
--- /dev/null
+++ b/automator/src/main/java/com/stardust/automator/filter/IntFilter.kt
@@ -0,0 +1,105 @@
+package com.stardust.automator.filter
+
+import com.stardust.automator.UiObject
+
+/**
+ * Created by Stardust on 2017/11/5.
+ */
+
+class IntFilter(private val mIntProperty: IntProperty, private val mValue: Int) : Filter {
+
+    interface IntProperty {
+        operator fun get(`object`: UiObject): Int
+    }
+
+    override fun filter(node: UiObject): Boolean {
+        return mIntProperty[node] == mValue
+    }
+
+    override fun toString(): String {
+        return mIntProperty.toString() + "(" + mValue + ")"
+    }
+
+    companion object {
+
+        val DEPTH: IntProperty = object : IntProperty {
+            override fun get(`object`: UiObject): Int {
+                return `object`.depth()
+            }
+
+            override fun toString(): String {
+                return "depth"
+            }
+        }
+
+        val ROW: IntProperty = object : IntProperty {
+            override fun get(`object`: UiObject): Int {
+                return `object`.row()
+            }
+
+            override fun toString(): String {
+                return "row"
+            }
+        }
+
+        val ROW_COUNT: IntProperty = object : IntProperty {
+            override fun get(`object`: UiObject): Int {
+                return `object`.rowCount()
+            }
+
+            override fun toString(): String {
+                return "rowCount"
+            }
+        }
+
+        val ROW_SPAN: IntProperty = object : IntProperty {
+            override fun get(`object`: UiObject): Int {
+                return `object`.rowSpan()
+            }
+
+            override fun toString(): String {
+                return "rowSpan"
+            }
+        }
+
+        val COLUMN: IntProperty = object : IntProperty {
+            override fun get(`object`: UiObject): Int {
+                return `object`.column()
+            }
+
+            override fun toString(): String {
+                return "column"
+            }
+        }
+
+        val COLUMN_COUNT: IntProperty = object : IntProperty {
+            override fun get(`object`: UiObject): Int {
+                return `object`.columnCount()
+            }
+
+            override fun toString(): String {
+                return "columnCount"
+            }
+        }
+
+        val COLUMN_SPAN: IntProperty = object : IntProperty {
+            override fun get(`object`: UiObject): Int {
+                return `object`.columnSpan()
+            }
+
+            override fun toString(): String {
+                return "columnSpan"
+            }
+        }
+
+        val INDEX_IN_PARENT: IntProperty = object : IntProperty {
+            override fun get(`object`: UiObject): Int {
+                return `object`.indexInParent()
+            }
+
+            override fun toString(): String {
+                return "indexInParent"
+            }
+        }
+    }
+}
diff --git a/automator/src/main/java/com/stardust/automator/filter/KeyGetter.java b/automator/src/main/java/com/stardust/automator/filter/KeyGetter.java
deleted file mode 100644
index e9ae8e3f..00000000
--- a/automator/src/main/java/com/stardust/automator/filter/KeyGetter.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.stardust.automator.filter;
-
-import com.stardust.automator.UiObject;
-
-/**
- * Created by Stardust on 2017/3/9.
- */
-
-public interface KeyGetter {
-
-    String getKey(UiObject nodeInfo);
-}
diff --git a/automator/src/main/java/com/stardust/automator/filter/KeyGetter.kt b/automator/src/main/java/com/stardust/automator/filter/KeyGetter.kt
new file mode 100644
index 00000000..17e8c432
--- /dev/null
+++ b/automator/src/main/java/com/stardust/automator/filter/KeyGetter.kt
@@ -0,0 +1,12 @@
+package com.stardust.automator.filter
+
+import com.stardust.automator.UiObject
+
+/**
+ * Created by Stardust on 2017/3/9.
+ */
+
+interface KeyGetter {
+
+    fun getKey(nodeInfo: UiObject): String?
+}
diff --git a/automator/src/main/java/com/stardust/automator/filter/ListFilter.java b/automator/src/main/java/com/stardust/automator/filter/ListFilter.java
deleted file mode 100644
index 2a805498..00000000
--- a/automator/src/main/java/com/stardust/automator/filter/ListFilter.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.stardust.automator.filter;
-
-import com.stardust.automator.UiObject;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Created by Stardust on 2017/3/9.
- */
-
-public interface ListFilter {
-
-    List<UiObject> filter(List<UiObject> nodes);
-
-    abstract class Default implements Filter, ListFilter {
-
-        @Override
-        public List<UiObject> filter(List<UiObject> nodes) {
-            List<UiObject> list = new ArrayList<>();
-            for (UiObject node : nodes) {
-                list.addAll(filter(node));
-            }
-            return list;
-        }
-    }
-
-}
diff --git a/automator/src/main/java/com/stardust/automator/filter/PackageNameFilter.java b/automator/src/main/java/com/stardust/automator/filter/PackageNameFilter.java
deleted file mode 100644
index 17436b03..00000000
--- a/automator/src/main/java/com/stardust/automator/filter/PackageNameFilter.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.stardust.automator.filter;
-
-import com.stardust.automator.UiObject;
-
-/**
- * Created by Stardust on 2017/3/9.
- */
-
-public class PackageNameFilter {
-
-    private static final KeyGetter PACKAGE_NAME_GETTER = new KeyGetter() {
-        @Override
-        public String getKey(UiObject nodeInfo) {
-            CharSequence charSequence = nodeInfo.getPackageName();
-            return charSequence == null ? null : charSequence.toString();
-        }
-
-        @Override
-        public String toString() {
-            return "packageName";
-        }
-    };
-
-    public static ListFilter equals(String text) {
-        return new StringEqualsFilter(text, PACKAGE_NAME_GETTER);
-    }
-
-    public static ListFilter contains(String str) {
-        return new StringContainsFilter(str, PACKAGE_NAME_GETTER);
-    }
-
-    public static ListFilter startsWith(String prefix) {
-        return new StringStartsWithFilter(prefix, PACKAGE_NAME_GETTER);
-    }
-
-    public static ListFilter endsWith(String suffix) {
-        return new StringEndsWithFilter(suffix, PACKAGE_NAME_GETTER);
-    }
-
-    public static ListFilter matches(String regex) {
-        return new StringMatchesFilter(regex, PACKAGE_NAME_GETTER);
-    }
-
-    private PackageNameFilter() {
-
-    }
-}
diff --git a/automator/src/main/java/com/stardust/automator/filter/PackageNameFilter.kt b/automator/src/main/java/com/stardust/automator/filter/PackageNameFilter.kt
new file mode 100644
index 00000000..8ca2ca4f
--- /dev/null
+++ b/automator/src/main/java/com/stardust/automator/filter/PackageNameFilter.kt
@@ -0,0 +1,41 @@
+package com.stardust.automator.filter
+
+import com.stardust.automator.UiObject
+
+/**
+ * Created by Stardust on 2017/3/9.
+ */
+
+object PackageNameFilter {
+
+    private val PACKAGE_NAME_GETTER = object : KeyGetter {
+        override fun getKey(nodeInfo: UiObject): String? {
+            val charSequence = nodeInfo.packageName
+            return charSequence?.toString()
+        }
+
+        override fun toString(): String {
+            return "packageName"
+        }
+    }
+
+    fun equals(text: String): Filter {
+        return StringEqualsFilter(text, PACKAGE_NAME_GETTER)
+    }
+
+    fun contains(str: String): Filter {
+        return StringContainsFilter(str, PACKAGE_NAME_GETTER)
+    }
+
+    fun startsWith(prefix: String): Filter {
+        return StringStartsWithFilter(prefix, PACKAGE_NAME_GETTER)
+    }
+
+    fun endsWith(suffix: String): Filter {
+        return StringEndsWithFilter(suffix, PACKAGE_NAME_GETTER)
+    }
+
+    fun matches(regex: String): Filter {
+        return StringMatchesFilter(regex, PACKAGE_NAME_GETTER)
+    }
+}
diff --git a/automator/src/main/java/com/stardust/automator/filter/Selector.kt b/automator/src/main/java/com/stardust/automator/filter/Selector.kt
new file mode 100644
index 00000000..5b14bc12
--- /dev/null
+++ b/automator/src/main/java/com/stardust/automator/filter/Selector.kt
@@ -0,0 +1,33 @@
+package com.stardust.automator.filter
+
+import com.stardust.automator.UiObject
+import java.util.*
+
+class Selector : Filter {
+    private val mFilters = LinkedList<Filter>()
+
+    override fun filter(node: UiObject): Boolean {
+        for (filter in mFilters) {
+            if (!filter.filter(node)) {
+                return false
+            }
+        }
+        return true
+    }
+
+    fun add(filter: Filter) {
+        mFilters.add(filter)
+    }
+
+    override fun toString(): String {
+        val str = StringBuilder()
+        for (filter in mFilters) {
+            str.append(filter.toString()).append(".")
+        }
+        if (str.isNotEmpty()) {
+            str.deleteCharAt(str.length - 1)
+        }
+        return str.toString()
+    }
+
+}
\ No newline at end of file
diff --git a/automator/src/main/java/com/stardust/automator/filter/StringContainsFilter.java b/automator/src/main/java/com/stardust/automator/filter/StringContainsFilter.java
deleted file mode 100644
index 2647cbb0..00000000
--- a/automator/src/main/java/com/stardust/automator/filter/StringContainsFilter.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.stardust.automator.filter;
-
-import com.stardust.automator.UiObject;
-
-/**
- * Created by Stardust on 2017/3/9.
- */
-
-public class StringContainsFilter extends DfsFilter {
-    private final KeyGetter mKeyGetter;
-    private final String mContains;
-
-    StringContainsFilter(String contains, KeyGetter keyGetter) {
-        mContains = contains;
-        mKeyGetter = keyGetter;
-    }
-
-    @Override
-    protected boolean isIncluded(UiObject nodeInfo) {
-        String key = mKeyGetter.getKey(nodeInfo);
-        return key != null && key.contains(mContains);
-    }
-
-    @Override
-    public String toString() {
-        return mKeyGetter.toString() + "Contains(\"" + mContains + "\")";
-    }
-}
diff --git a/automator/src/main/java/com/stardust/automator/filter/StringContainsFilter.kt b/automator/src/main/java/com/stardust/automator/filter/StringContainsFilter.kt
new file mode 100644
index 00000000..7406e5c6
--- /dev/null
+++ b/automator/src/main/java/com/stardust/automator/filter/StringContainsFilter.kt
@@ -0,0 +1,19 @@
+package com.stardust.automator.filter
+
+import com.stardust.automator.UiObject
+
+/**
+ * Created by Stardust on 2017/3/9.
+ */
+
+class StringContainsFilter internal constructor(private val mContains: String, private val mKeyGetter: KeyGetter) : Filter {
+
+    override fun filter(node: UiObject): Boolean {
+        val key = mKeyGetter.getKey(node)
+        return key != null && key.contains(mContains)
+    }
+
+    override fun toString(): String {
+        return mKeyGetter.toString() + "Contains(\"" + mContains + "\")"
+    }
+}
diff --git a/automator/src/main/java/com/stardust/automator/filter/StringEndsWithFilter.java b/automator/src/main/java/com/stardust/automator/filter/StringEndsWithFilter.java
deleted file mode 100644
index ee78bebd..00000000
--- a/automator/src/main/java/com/stardust/automator/filter/StringEndsWithFilter.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.stardust.automator.filter;
-
-import com.stardust.automator.UiObject;
-
-/**
- * Created by Stardust on 2017/3/9.
- */
-
-public class StringEndsWithFilter extends DfsFilter {
-
-    private final String mSuffix;
-    private final KeyGetter mKeyGetter;
-
-    public StringEndsWithFilter(String suffix, KeyGetter keyGetter) {
-        mSuffix = suffix;
-        mKeyGetter = keyGetter;
-    }
-
-    @Override
-    protected boolean isIncluded(UiObject nodeInfo) {
-        String key = mKeyGetter.getKey(nodeInfo);
-        return key != null && key.endsWith(mSuffix);
-    }
-
-    @Override
-    public String toString() {
-        return mKeyGetter.toString() + "EndsWith(\"" + mSuffix + "\")";
-    }
-}
diff --git a/automator/src/main/java/com/stardust/automator/filter/StringEndsWithFilter.kt b/automator/src/main/java/com/stardust/automator/filter/StringEndsWithFilter.kt
new file mode 100644
index 00000000..7e040c40
--- /dev/null
+++ b/automator/src/main/java/com/stardust/automator/filter/StringEndsWithFilter.kt
@@ -0,0 +1,19 @@
+package com.stardust.automator.filter
+
+import com.stardust.automator.UiObject
+
+/**
+ * Created by Stardust on 2017/3/9.
+ */
+
+class StringEndsWithFilter(private val mSuffix: String, private val mKeyGetter: KeyGetter) : Filter {
+
+    override fun filter(node: UiObject): Boolean {
+        val key = mKeyGetter.getKey(node)
+        return key != null && key.endsWith(mSuffix)
+    }
+
+    override fun toString(): String {
+        return mKeyGetter.toString() + "EndsWith(\"" + mSuffix + "\")"
+    }
+}
diff --git a/automator/src/main/java/com/stardust/automator/filter/StringEqualsFilter.java b/automator/src/main/java/com/stardust/automator/filter/StringEqualsFilter.java
deleted file mode 100644
index 27ff9168..00000000
--- a/automator/src/main/java/com/stardust/automator/filter/StringEqualsFilter.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.stardust.automator.filter;
-
-import com.stardust.automator.UiObject;
-
-/**
- * Created by Stardust on 2017/3/9.
- */
-
-public class StringEqualsFilter extends DfsFilter {
-
-    private String mValue;
-    private KeyGetter mKeyGetter;
-
-    public StringEqualsFilter(String value, KeyGetter getter) {
-        mValue = value;
-        mKeyGetter = getter;
-    }
-
-    @Override
-    protected boolean isIncluded(UiObject nodeInfo) {
-        String key = mKeyGetter.getKey(nodeInfo);
-        if (key != null) {
-            return key.equals(mValue);
-        }
-        return false;
-    }
-
-    @Override
-    public String toString() {
-        return mKeyGetter.toString() + "(\"" + mValue + "\")";
-    }
-}
diff --git a/automator/src/main/java/com/stardust/automator/filter/StringEqualsFilter.kt b/automator/src/main/java/com/stardust/automator/filter/StringEqualsFilter.kt
new file mode 100644
index 00000000..bc70123e
--- /dev/null
+++ b/automator/src/main/java/com/stardust/automator/filter/StringEqualsFilter.kt
@@ -0,0 +1,21 @@
+package com.stardust.automator.filter
+
+import com.stardust.automator.UiObject
+
+/**
+ * Created by Stardust on 2017/3/9.
+ */
+
+class StringEqualsFilter(private val mValue: String, private val mKeyGetter: KeyGetter) : Filter {
+
+    override fun filter(node: UiObject): Boolean {
+        val key = mKeyGetter.getKey(node)
+        return if (key != null) {
+            key == mValue
+        } else false
+    }
+
+    override fun toString(): String {
+        return mKeyGetter.toString() + "(\"" + mValue + "\")"
+    }
+}
diff --git a/automator/src/main/java/com/stardust/automator/filter/StringMatchesFilter.java b/automator/src/main/java/com/stardust/automator/filter/StringMatchesFilter.java
deleted file mode 100644
index bcab8b4f..00000000
--- a/automator/src/main/java/com/stardust/automator/filter/StringMatchesFilter.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.stardust.automator.filter;
-
-import com.stardust.automator.UiObject;
-
-/**
- * Created by Stardust on 2017/3/9.
- */
-
-public class StringMatchesFilter extends DfsFilter {
-
-    private final String mRegex;
-    private final KeyGetter mKeyGetter;
-
-    StringMatchesFilter(String regex, KeyGetter keyGetter) {
-        mRegex = regex;
-        mKeyGetter = keyGetter;
-    }
-
-    @Override
-    protected boolean isIncluded(UiObject nodeInfo) {
-        String key = mKeyGetter.getKey(nodeInfo);
-        return key != null && key.matches(mRegex);
-    }
-
-    @Override
-    public String toString() {
-        return mKeyGetter.toString() + "Matches(\"" + mRegex + "\")";
-    }
-}
diff --git a/automator/src/main/java/com/stardust/automator/filter/StringMatchesFilter.kt b/automator/src/main/java/com/stardust/automator/filter/StringMatchesFilter.kt
new file mode 100644
index 00000000..325ed168
--- /dev/null
+++ b/automator/src/main/java/com/stardust/automator/filter/StringMatchesFilter.kt
@@ -0,0 +1,19 @@
+package com.stardust.automator.filter
+
+import com.stardust.automator.UiObject
+
+/**
+ * Created by Stardust on 2017/3/9.
+ */
+
+class StringMatchesFilter internal constructor(private val mRegex: String, private val mKeyGetter: KeyGetter) : Filter {
+
+    override fun filter(node: UiObject): Boolean {
+        val key = mKeyGetter.getKey(node)
+        return key != null && key.matches(mRegex.toRegex())
+    }
+
+    override fun toString(): String {
+        return mKeyGetter.toString() + "Matches(\"" + mRegex + "\")"
+    }
+}
diff --git a/automator/src/main/java/com/stardust/automator/filter/StringStartsWithFilter.java b/automator/src/main/java/com/stardust/automator/filter/StringStartsWithFilter.java
deleted file mode 100644
index 954f0f73..00000000
--- a/automator/src/main/java/com/stardust/automator/filter/StringStartsWithFilter.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.stardust.automator.filter;
-
-import com.stardust.automator.UiObject;
-
-/**
- * Created by Stardust on 2017/3/9.
- */
-
-public class StringStartsWithFilter extends DfsFilter {
-
-    private final String mPrefix;
-    private final KeyGetter mKeyGetter;
-
-    public StringStartsWithFilter(String prefix, KeyGetter keyGetter) {
-        mPrefix = prefix;
-        mKeyGetter = keyGetter;
-    }
-
-    @Override
-    protected boolean isIncluded(UiObject nodeInfo) {
-        String key = mKeyGetter.getKey(nodeInfo);
-        return key != null && key.startsWith(mPrefix);
-    }
-
-    @Override
-    public String toString() {
-        return mKeyGetter.toString() + "StartsWith(\"" + mPrefix + "\")";
-    }
-}
diff --git a/automator/src/main/java/com/stardust/automator/filter/StringStartsWithFilter.kt b/automator/src/main/java/com/stardust/automator/filter/StringStartsWithFilter.kt
new file mode 100644
index 00000000..d4be471b
--- /dev/null
+++ b/automator/src/main/java/com/stardust/automator/filter/StringStartsWithFilter.kt
@@ -0,0 +1,19 @@
+package com.stardust.automator.filter
+
+import com.stardust.automator.UiObject
+
+/**
+ * Created by Stardust on 2017/3/9.
+ */
+
+class StringStartsWithFilter(private val mPrefix: String, private val mKeyGetter: KeyGetter) : Filter {
+
+    override fun filter(node: UiObject): Boolean {
+        val key = mKeyGetter.getKey(node)
+        return key != null && key.startsWith(mPrefix)
+    }
+
+    override fun toString(): String {
+        return mKeyGetter.toString() + "StartsWith(\"" + mPrefix + "\")"
+    }
+}
diff --git a/automator/src/main/java/com/stardust/automator/filter/TextFilter.java b/automator/src/main/java/com/stardust/automator/filter/TextFilter.java
deleted file mode 100644
index fc87dc12..00000000
--- a/automator/src/main/java/com/stardust/automator/filter/TextFilter.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package com.stardust.automator.filter;
-
-import com.stardust.automator.UiObject;
-
-import java.util.List;
-
-/**
- * Created by Stardust on 2017/3/9.
- */
-
-public class TextFilter extends ListFilter.Default {
-
-    private static final KeyGetter TEXT_GETTER = new KeyGetter() {
-        @Override
-        public String getKey(UiObject nodeInfo) {
-            CharSequence charSequence = nodeInfo.getText();
-            return charSequence == null ? null : charSequence.toString();
-        }
-
-        @Override
-        public String toString() {
-            return "text";
-        }
-    };
-
-    public static ListFilter equals(String text) {
-        return new StringEqualsFilter(text, TEXT_GETTER);
-    }
-
-    public static ListFilter contains(String str) {
-        return new StringContainsFilter(str, TEXT_GETTER);
-    }
-
-    public static ListFilter startsWith(String prefix) {
-        return new StringStartsWithFilter(prefix, TEXT_GETTER);
-    }
-
-    public static ListFilter endsWith(String suffix) {
-        return new StringEndsWithFilter(suffix, TEXT_GETTER);
-    }
-
-    public static ListFilter matches(String regex) {
-        return new StringMatchesFilter(regex, TEXT_GETTER);
-    }
-
-    private String mText;
-
-    private TextFilter(String text) {
-        mText = text;
-    }
-
-
-    @Override
-    public List<UiObject> filter(UiObject node) {
-        return node.findByText(mText);
-    }
-}
diff --git a/automator/src/main/java/com/stardust/automator/filter/TextFilters.kt b/automator/src/main/java/com/stardust/automator/filter/TextFilters.kt
new file mode 100644
index 00000000..ad4eb847
--- /dev/null
+++ b/automator/src/main/java/com/stardust/automator/filter/TextFilters.kt
@@ -0,0 +1,41 @@
+package com.stardust.automator.filter
+
+import com.stardust.automator.UiObject
+
+/**
+ * Created by Stardust on 2017/3/9.
+ */
+
+object TextFilters {
+
+    private val TEXT_GETTER = object : KeyGetter {
+        override fun getKey(nodeInfo: UiObject): String? {
+            val charSequence = nodeInfo.text
+            return charSequence?.toString()
+        }
+
+        override fun toString(): String {
+            return "text"
+        }
+    }
+
+    fun equals(text: String): Filter {
+        return StringEqualsFilter(text, TEXT_GETTER)
+    }
+
+    fun contains(str: String): Filter {
+        return StringContainsFilter(str, TEXT_GETTER)
+    }
+
+    fun startsWith(prefix: String): Filter {
+        return StringStartsWithFilter(prefix, TEXT_GETTER)
+    }
+
+    fun endsWith(suffix: String): Filter {
+        return StringEndsWithFilter(suffix, TEXT_GETTER)
+    }
+
+    fun matches(regex: String): Filter {
+        return StringMatchesFilter(regex, TEXT_GETTER)
+    }
+}
diff --git a/automator/src/main/java/com/stardust/automator/search/BFS.kt b/automator/src/main/java/com/stardust/automator/search/BFS.kt
new file mode 100644
index 00000000..9f002b1f
--- /dev/null
+++ b/automator/src/main/java/com/stardust/automator/search/BFS.kt
@@ -0,0 +1,32 @@
+package com.stardust.automator.search
+
+import com.stardust.automator.UiObject
+import com.stardust.automator.filter.Filter
+import java.util.*
+import kotlin.collections.ArrayList
+
+object BFS : SearchAlgorithm {
+
+    override fun search(root: UiObject, filter: Filter, limit: Int): ArrayList<UiObject> {
+        val result = ArrayList<UiObject>()
+        val queue = ArrayDeque<UiObject>()
+        queue.add(root)
+        while (!queue.isEmpty()) {
+            val top = queue.poll()
+            val isTarget = filter.filter(top)
+            if (isTarget) {
+                result.add(top)
+                if (result.size > limit) {
+                    return result
+                }
+            }
+            for (i in 0 until top.childCount) {
+                queue.add(top.child(i) ?: continue)
+            }
+            if (!isTarget && top !== root) {
+                top.recycle()
+            }
+        }
+        return result
+    }
+}
\ No newline at end of file
diff --git a/automator/src/main/java/com/stardust/automator/search/DFS.kt b/automator/src/main/java/com/stardust/automator/search/DFS.kt
new file mode 100644
index 00000000..6f7efdd8
--- /dev/null
+++ b/automator/src/main/java/com/stardust/automator/search/DFS.kt
@@ -0,0 +1,43 @@
+package com.stardust.automator.search
+
+import com.stardust.automator.UiObject
+import com.stardust.automator.filter.Filter
+
+import kotlin.collections.ArrayList
+
+/**
+ * Created by Stardust on 2017/3/9.
+ */
+
+object DFS : SearchAlgorithm {
+
+    override fun search(root: UiObject, filter: Filter, limit: Int): ArrayList<UiObject> {
+        val list = ArrayList<UiObject>()
+        if (filter.filter(root)) {
+            list.add(root)
+            if (list.size >= limit) {
+                return list
+            }
+        }
+        searchChildren(root, list, filter, limit)
+        return list
+    }
+
+    private fun searchChildren(parent: UiObject, list: MutableList<UiObject>, filter: Filter, limit: Int) {
+        for (i in 0 until parent.childCount) {
+            val child = parent.child(i) ?: continue
+            val isTarget = filter.filter(child)
+            if (isTarget) {
+                list.add(child)
+                if (list.size >= limit) {
+                    break
+                }
+            }
+            searchChildren(child, list, filter, limit)
+            if (!isTarget) {
+                child.recycle()
+            }
+        }
+    }
+
+}
diff --git a/automator/src/main/java/com/stardust/automator/search/SearchAlgorithm.kt b/automator/src/main/java/com/stardust/automator/search/SearchAlgorithm.kt
new file mode 100644
index 00000000..81206ecb
--- /dev/null
+++ b/automator/src/main/java/com/stardust/automator/search/SearchAlgorithm.kt
@@ -0,0 +1,9 @@
+package com.stardust.automator.search
+
+import com.stardust.automator.UiObject
+import com.stardust.automator.filter.Filter
+
+interface SearchAlgorithm {
+
+    fun search(root: UiObject, filter: Filter, limit: Int = Int.MAX_VALUE): ArrayList<UiObject>
+}
\ No newline at end of file
diff --git a/automator/src/main/java/com/stardust/automator/simple_action/Able.java b/automator/src/main/java/com/stardust/automator/simple_action/Able.java
deleted file mode 100644
index 32733e39..00000000
--- a/automator/src/main/java/com/stardust/automator/simple_action/Able.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package com.stardust.automator.simple_action;
-
-import android.util.SparseArray;
-import android.view.accessibility.AccessibilityNodeInfo;
-
-import com.stardust.automator.UiObject;
-import com.stardust.util.SparseArrayEntries;
-
-/**
- * Created by Stardust on 2017/1/27.
- */
-
-public interface Able {
-
-    SparseArray<Able> ABLE_MAP = new SparseArrayEntries<Able>()
-            .entry(AccessibilityNodeInfo.ACTION_CLICK, new Able() {
-                @Override
-                public boolean isAble(UiObject nodeInfo) {
-                    return nodeInfo.isClickable();
-                }
-            })
-            .entry(AccessibilityNodeInfo.ACTION_LONG_CLICK, new Able() {
-                @Override
-                public boolean isAble(UiObject nodeInfo) {
-                    return nodeInfo.isLongClickable();
-                }
-            })
-            .entry(AccessibilityNodeInfo.ACTION_FOCUS, new Able() {
-                @Override
-                public boolean isAble(UiObject nodeInfo) {
-                    return nodeInfo.isFocusable();
-                }
-            })
-            .entry(AccessibilityNodeInfo.ACTION_SCROLL_BACKWARD, new Able() {
-                @Override
-                public boolean isAble(UiObject nodeInfo) {
-                    return nodeInfo.isScrollable();
-                }
-            })
-            .entry(AccessibilityNodeInfo.ACTION_SCROLL_FORWARD, new Able() {
-                @Override
-                public boolean isAble(UiObject nodeInfo) {
-                    return nodeInfo.isScrollable();
-                }
-            })
-            .sparseArray();
-
-    boolean isAble(UiObject node);
-
-}
diff --git a/automator/src/main/java/com/stardust/automator/simple_action/Able.kt b/automator/src/main/java/com/stardust/automator/simple_action/Able.kt
new file mode 100644
index 00000000..345a4523
--- /dev/null
+++ b/automator/src/main/java/com/stardust/automator/simple_action/Able.kt
@@ -0,0 +1,46 @@
+package com.stardust.automator.simple_action
+
+import android.view.accessibility.AccessibilityNodeInfo
+import com.stardust.automator.UiObject
+import com.stardust.util.SparseArrayEntries
+
+/**
+ * Created by Stardust on 2017/1/27.
+ */
+
+interface Able {
+
+    fun isAble(node: UiObject): Boolean
+
+    companion object {
+
+        val ABLE_MAP = SparseArrayEntries<Able>()
+                .entry(AccessibilityNodeInfo.ACTION_CLICK, object : Able {
+                    override fun isAble(nodeInfo: UiObject): Boolean {
+                        return nodeInfo.isClickable
+                    }
+                })
+                .entry(AccessibilityNodeInfo.ACTION_LONG_CLICK, object : Able {
+                    override fun isAble(nodeInfo: UiObject): Boolean {
+                        return nodeInfo.isLongClickable
+                    }
+                })
+                .entry(AccessibilityNodeInfo.ACTION_FOCUS, object : Able {
+                    override fun isAble(nodeInfo: UiObject): Boolean {
+                        return nodeInfo.isFocusable
+                    }
+                })
+                .entry(AccessibilityNodeInfo.ACTION_SCROLL_BACKWARD, object : Able {
+                    override fun isAble(nodeInfo: UiObject): Boolean {
+                        return nodeInfo.isScrollable
+                    }
+                })
+                .entry(AccessibilityNodeInfo.ACTION_SCROLL_FORWARD, object : Able {
+                    override fun isAble(nodeInfo: UiObject): Boolean {
+                        return nodeInfo.isScrollable
+                    }
+                })
+                .sparseArray()
+    }
+
+}
diff --git a/automator/src/main/java/com/stardust/automator/simple_action/ActionFactory.java b/automator/src/main/java/com/stardust/automator/simple_action/ActionFactory.java
deleted file mode 100644
index e18fe2e9..00000000
--- a/automator/src/main/java/com/stardust/automator/simple_action/ActionFactory.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package com.stardust.automator.simple_action;
-
-import android.graphics.Rect;
-import android.os.Build;
-import android.os.Bundle;
-import android.support.annotation.RequiresApi;
-import android.view.accessibility.AccessibilityNodeInfo;
-
-import com.stardust.automator.UiObject;
-import com.stardust.util.MapBuilder;
-
-import java.util.Map;
-
-/**
- * Created by Stardust on 2017/1/27.
- */
-
-public class ActionFactory {
-
-    private static Map<Integer, Object> searchUpAction = new MapBuilder<Integer, Object>()
-            .put(AccessibilityNodeInfo.ACTION_CLICK, null)
-            .put(AccessibilityNodeInfo.ACTION_LONG_CLICK, null)
-            .put(AccessibilityNodeInfo.ACTION_SELECT, null)
-            .put(AccessibilityNodeInfo.ACTION_FOCUS, null)
-            .put(AccessibilityNodeInfo.ACTION_SELECT, null)
-            .put(AccessibilityNodeInfo.ACTION_SCROLL_BACKWARD, null)
-            .put(AccessibilityNodeInfo.ACTION_SCROLL_FORWARD, null)
-            .build();
-
-    public static SimpleAction createActionWithTextFilter(int action, String text, int index) {
-        if (searchUpAction.containsKey(action))
-            return new SearchUpTargetAction(action, new FilterAction.TextFilter(text, index));
-        else
-            return new DepthFirstSearchTargetAction(action, new FilterAction.TextFilter(text, index));
-    }
-
-    public static SimpleAction createActionWithBoundsFilter(int action, Rect rect) {
-        if (searchUpAction.containsKey(action))
-            return new SearchUpTargetAction(action, new FilterAction.BoundsFilter(rect));
-        else
-            return new DepthFirstSearchTargetAction(action, new FilterAction.BoundsFilter(rect));
-    }
-
-    @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
-    public static SimpleAction createActionWithEditableFilter(final int action, int index, final String text) {
-        return new SearchTargetAction(action, new FilterAction.EditableFilter(index)) {
-
-            @Override
-            protected boolean performAction(UiObject node) {
-                Bundle args = new Bundle();
-                if (action == AccessibilityNodeInfo.ACTION_SET_TEXT) {
-                    args.putCharSequence(AccessibilityNodeInfo.ACTION_ARGUMENT_SET_TEXT_CHARSEQUENCE, text);
-                } else {
-                    args.putCharSequence(AccessibilityNodeInfo.ACTION_ARGUMENT_SET_TEXT_CHARSEQUENCE, node.text() + text);
-                }
-                return node.performAction(AccessibilityNodeInfo.ACTION_SET_TEXT, args);
-            }
-        };
-    }
-
-    public static SimpleAction createScrollMaxAction(int action) {
-        return new ScrollMaxAction(action);
-    }
-
-    public static SimpleAction createScrollAction(int action, int i) {
-        return new ScrollAction(action, i);
-    }
-
-    public static SimpleAction createActionWithIdFilter(int action, String id) {
-        return new FilterAction.SimpleFilterAction(action, new FilterAction.IdFilter(id));
-    }
-}
diff --git a/automator/src/main/java/com/stardust/automator/simple_action/ActionFactory.kt b/automator/src/main/java/com/stardust/automator/simple_action/ActionFactory.kt
new file mode 100644
index 00000000..0135866a
--- /dev/null
+++ b/automator/src/main/java/com/stardust/automator/simple_action/ActionFactory.kt
@@ -0,0 +1,69 @@
+package com.stardust.automator.simple_action
+
+import android.graphics.Rect
+import android.os.Build
+import android.os.Bundle
+import androidx.annotation.RequiresApi
+import android.view.accessibility.AccessibilityNodeInfo
+
+import com.stardust.automator.UiObject
+import com.stardust.util.MapBuilder
+
+/**
+ * Created by Stardust on 2017/1/27.
+ */
+
+object ActionFactory {
+
+    private val searchUpAction = MapBuilder<Int, Any>()
+            .put(AccessibilityNodeInfo.ACTION_CLICK, null)
+            .put(AccessibilityNodeInfo.ACTION_LONG_CLICK, null)
+            .put(AccessibilityNodeInfo.ACTION_SELECT, null)
+            .put(AccessibilityNodeInfo.ACTION_FOCUS, null)
+            .put(AccessibilityNodeInfo.ACTION_SELECT, null)
+            .put(AccessibilityNodeInfo.ACTION_SCROLL_BACKWARD, null)
+            .put(AccessibilityNodeInfo.ACTION_SCROLL_FORWARD, null)
+            .build()
+
+    fun createActionWithTextFilter(action: Int, text: String, index: Int): SimpleAction {
+        return if (searchUpAction.containsKey(action))
+            SearchUpTargetAction(action, FilterAction.TextFilter(text, index))
+        else
+            DepthFirstSearchTargetAction(action, FilterAction.TextFilter(text, index))
+    }
+
+    fun createActionWithBoundsFilter(action: Int, rect: Rect): SimpleAction {
+        return if (searchUpAction.containsKey(action))
+            SearchUpTargetAction(action, FilterAction.BoundsFilter(rect))
+        else
+            DepthFirstSearchTargetAction(action, FilterAction.BoundsFilter(rect))
+    }
+
+    @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
+    fun createActionWithEditableFilter(action: Int, index: Int, text: String): SimpleAction {
+        return object : SearchTargetAction(action, FilterAction.EditableFilter(index)) {
+
+            override fun performAction(node: UiObject): Boolean {
+                val args = Bundle()
+                if (action == AccessibilityNodeInfo.ACTION_SET_TEXT) {
+                    args.putCharSequence(AccessibilityNodeInfo.ACTION_ARGUMENT_SET_TEXT_CHARSEQUENCE, text)
+                } else {
+                    args.putCharSequence(AccessibilityNodeInfo.ACTION_ARGUMENT_SET_TEXT_CHARSEQUENCE, node.text() + text)
+                }
+                return node.performAction(AccessibilityNodeInfo.ACTION_SET_TEXT, args)
+            }
+        }
+    }
+
+    fun createScrollMaxAction(action: Int): SimpleAction {
+        return ScrollMaxAction(action)
+    }
+
+    fun createScrollAction(action: Int, i: Int): SimpleAction {
+        return ScrollAction(action, i)
+    }
+
+    fun createActionWithIdFilter(action: Int, id: String): SimpleAction {
+        return FilterAction.SimpleFilterAction(action, FilterAction.IdFilter(id))
+    }
+}
diff --git a/automator/src/main/java/com/stardust/automator/simple_action/ActionTarget.java b/automator/src/main/java/com/stardust/automator/simple_action/ActionTarget.java
deleted file mode 100644
index fd3388d4..00000000
--- a/automator/src/main/java/com/stardust/automator/simple_action/ActionTarget.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package com.stardust.automator.simple_action;
-
-import android.graphics.Rect;
-import android.os.Build;
-import android.support.annotation.RequiresApi;
-
-/**
- * Created by Stardust on 2017/1/27.
- */
-
-public interface ActionTarget {
-
-    SimpleAction createAction(int action, Object... params);
-
-    class TextActionTarget implements ActionTarget {
-
-        String mText;
-        int mIndex;
-
-        public TextActionTarget(String text, int i) {
-            mText = text;
-            mIndex = i;
-        }
-
-        @Override
-        public SimpleAction createAction(int action, Object... params) {
-            return ActionFactory.createActionWithTextFilter(action, mText, mIndex);
-        }
-    }
-
-    class BoundsActionTarget implements ActionTarget {
-
-        Rect mBoundsInRect;
-
-        public BoundsActionTarget(Rect rect) {
-            mBoundsInRect = rect;
-        }
-
-        @Override
-        public SimpleAction createAction(int action, Object... params) {
-            return ActionFactory.createActionWithBoundsFilter(action, mBoundsInRect);
-        }
-    }
-
-    @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
-    class EditableActionTarget implements ActionTarget {
-        private int mIndex;
-
-        public EditableActionTarget(int index) {
-            mIndex = index;
-        }
-
-        @Override
-        public SimpleAction createAction(int action, Object... params) {
-            return ActionFactory.createActionWithEditableFilter(action, mIndex, params[0].toString());
-        }
-    }
-
-    class IdActionTarget implements ActionTarget {
-        private String mId;
-
-        public IdActionTarget(String id) {
-            mId = id;
-        }
-
-        @Override
-        public SimpleAction createAction(int action, Object... params) {
-            return ActionFactory.createActionWithIdFilter(action, mId);
-        }
-    }
-}
diff --git a/automator/src/main/java/com/stardust/automator/simple_action/ActionTarget.kt b/automator/src/main/java/com/stardust/automator/simple_action/ActionTarget.kt
new file mode 100644
index 00000000..89a7b72b
--- /dev/null
+++ b/automator/src/main/java/com/stardust/automator/simple_action/ActionTarget.kt
@@ -0,0 +1,43 @@
+package com.stardust.automator.simple_action
+
+import android.graphics.Rect
+import android.os.Build
+import androidx.annotation.RequiresApi
+
+/**
+ * Created by Stardust on 2017/1/27.
+ */
+
+interface ActionTarget {
+
+    fun createAction(action: Int, vararg params: Any): SimpleAction
+
+    class TextActionTarget(private var mText: String, internal var mIndex: Int) : ActionTarget {
+
+        override fun createAction(action: Int, vararg params: Any): SimpleAction {
+            return ActionFactory.createActionWithTextFilter(action, mText, mIndex)
+        }
+    }
+
+    class BoundsActionTarget(private var mBoundsInRect: Rect) : ActionTarget {
+
+        override fun createAction(action: Int, vararg params: Any): SimpleAction {
+            return ActionFactory.createActionWithBoundsFilter(action, mBoundsInRect)
+        }
+    }
+
+    @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
+    class EditableActionTarget(private val mIndex: Int) : ActionTarget {
+
+        override fun createAction(action: Int, vararg params: Any): SimpleAction {
+            return ActionFactory.createActionWithEditableFilter(action, mIndex, params[0].toString())
+        }
+    }
+
+    class IdActionTarget(private val mId: String) : ActionTarget {
+
+        override fun createAction(action: Int, vararg params: Any): SimpleAction {
+            return ActionFactory.createActionWithIdFilter(action, mId)
+        }
+    }
+}
diff --git a/automator/src/main/java/com/stardust/automator/simple_action/DepthFirstSearchTargetAction.java b/automator/src/main/java/com/stardust/automator/simple_action/DepthFirstSearchTargetAction.java
deleted file mode 100644
index 7268040f..00000000
--- a/automator/src/main/java/com/stardust/automator/simple_action/DepthFirstSearchTargetAction.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.stardust.automator.simple_action;
-
-import com.stardust.automator.UiObject;
-
-/**
- * Created by Stardust on 2017/1/27.
- */
-
-public class DepthFirstSearchTargetAction extends SearchTargetAction {
-
-
-    private Able mAble;
-
-    public DepthFirstSearchTargetAction(int action, Filter filter) {
-        super(action, filter);
-        mAble = Able.ABLE_MAP.get(action);
-    }
-
-
-    @Override
-    public UiObject searchTarget(UiObject n) {
-        if (n == null)
-            return null;
-        if (mAble.isAble(n))
-            return n;
-        for (int i = 0; i < n.getChildCount(); i++) {
-            UiObject child = n.child(i);
-            if (child == null)
-                continue;
-            UiObject node = searchTarget(child);
-            if (node != null)
-                return node;
-        }
-        return null;
-    }
-
-
-}
diff --git a/automator/src/main/java/com/stardust/automator/simple_action/DepthFirstSearchTargetAction.kt b/automator/src/main/java/com/stardust/automator/simple_action/DepthFirstSearchTargetAction.kt
new file mode 100644
index 00000000..1c06839a
--- /dev/null
+++ b/automator/src/main/java/com/stardust/automator/simple_action/DepthFirstSearchTargetAction.kt
@@ -0,0 +1,28 @@
+package com.stardust.automator.simple_action
+
+import com.stardust.automator.UiObject
+
+/**
+ * Created by Stardust on 2017/1/27.
+ */
+
+class DepthFirstSearchTargetAction(action: Int, filter: FilterAction.Filter) : SearchTargetAction(action, filter) {
+
+    private val mAble: Able = Able.ABLE_MAP.get(action)
+
+    override fun searchTarget(node: UiObject?): UiObject? {
+        if (node == null)
+            return null
+        if (mAble.isAble(node))
+            return node
+        for (i in 0 until node.childCount) {
+            val child = node.child(i) ?: continue
+            val targetNode = searchTarget(child)
+            if (targetNode != null)
+                return targetNode
+        }
+        return null
+    }
+
+
+}
diff --git a/automator/src/main/java/com/stardust/automator/simple_action/FilterAction.java b/automator/src/main/java/com/stardust/automator/simple_action/FilterAction.java
deleted file mode 100644
index 7cc0c7d2..00000000
--- a/automator/src/main/java/com/stardust/automator/simple_action/FilterAction.java
+++ /dev/null
@@ -1,205 +0,0 @@
-package com.stardust.automator.simple_action;
-
-import android.graphics.Rect;
-
-import com.stardust.automator.UiObject;
-import com.stardust.automator.filter.BoundsFilter;
-import com.stardust.view.accessibility.AccessibilityNodeInfoHelper;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.LinkedList;
-import java.util.List;
-
-/**
- * Created by Stardust on 2017/1/27.
- */
-
-public abstract class FilterAction extends SimpleAction {
-
-
-    public interface Filter {
-
-        List<UiObject> filter(UiObject root);
-    }
-
-    public static class TextFilter implements Filter {
-
-        String mText;
-        int mIndex;
-
-        public TextFilter(String text, int index) {
-            mText = text;
-            mIndex = index;
-        }
-
-        @Override
-        public List<UiObject> filter(UiObject root) {
-            List<UiObject> list = root.findByText(mText);
-            if (mIndex == -1)
-                return list;
-            if (mIndex >= list.size())
-                return Collections.emptyList();
-            return Collections.singletonList(list.get(mIndex));
-        }
-
-        @Override
-        public String toString() {
-            return "TextFilter{" +
-                    "mText='" + mText + '\'' +
-                    ", mIndex=" + mIndex +
-                    '}';
-        }
-    }
-
-    public static class BoundsFilter implements Filter {
-
-        Rect mBoundsInScreen;
-
-        public BoundsFilter(Rect boundsInScreen) {
-            mBoundsInScreen = boundsInScreen;
-        }
-
-        @Override
-        public List<UiObject> filter(UiObject root) {
-            List<UiObject> list = new ArrayList<>();
-            findAccessibilityNodeInfosByBounds(root, list);
-            return list;
-        }
-
-        private void findAccessibilityNodeInfosByBounds(UiObject root, List<UiObject> list) {
-            if (root == null)
-                return;
-            Rect rect = new Rect();
-            root.getBoundsInScreen(rect);
-            if (rect.equals(mBoundsInScreen)) {
-                list.add(root);
-            }
-            int oldSize = list.size();
-            for (int i = 0; i < root.getChildCount(); i++) {
-                UiObject child = root.child(i);
-                if (child == null)
-                    continue;
-                findAccessibilityNodeInfosByBounds(child, list);
-            }
-            if (oldSize == list.size() && rect.contains(mBoundsInScreen)) {
-                list.add(root);
-            }
-        }
-
-        @Override
-        public String toString() {
-            return "BoundsFilter{" +
-                    "mBoundsInScreen=" + mBoundsInScreen +
-                    '}';
-        }
-    }
-
-    public static class EditableFilter implements Filter {
-
-        private int mIndex;
-
-        public EditableFilter(int index) {
-            mIndex = index;
-        }
-
-        @Override
-        public List<UiObject> filter(UiObject root) {
-            List<UiObject> editableList = findEditable(root);
-            if (mIndex == -1)
-                return editableList;
-            if (mIndex >= editableList.size())
-                return Collections.emptyList();
-            return Collections.singletonList(editableList.get(mIndex));
-        }
-
-        public static List<UiObject> findEditable(UiObject root) {
-            if (root == null) {
-                return Collections.emptyList();
-            }
-            if (root.isEditable()) {
-                return Collections.singletonList(root);
-            }
-            List<UiObject> list = new LinkedList<>();
-            for (int i = 0; i < root.getChildCount(); i++) {
-                list.addAll(findEditable(root.child(i)));
-            }
-            return list;
-        }
-
-        @Override
-        public String toString() {
-            return "EditableFilter{" +
-                    "mIndex=" + mIndex +
-                    '}';
-        }
-    }
-
-    public static class IdFilter implements Filter {
-
-        private final String mId;
-
-        public IdFilter(String id) {
-            this.mId = id;
-        }
-
-        @Override
-        public List<UiObject> filter(UiObject root) {
-            return root.findByViewId(mId);
-        }
-
-        @Override
-        public String toString() {
-            return "IdFilter{" +
-                    "mId='" + mId + '\'' +
-                    '}';
-        }
-    }
-
-
-    private Filter mFilter;
-
-    public FilterAction(Filter filter) {
-        mFilter = filter;
-    }
-
-    @Override
-    public boolean perform(UiObject root) {
-        if (root == null)
-            return false;
-        List<UiObject> list = mFilter.filter(root);
-        return perform(list);
-    }
-
-    public abstract boolean perform(List<UiObject> nodes);
-
-    public static class SimpleFilterAction extends FilterAction {
-
-        private int mAction;
-
-        public SimpleFilterAction(int action, Filter filter) {
-            super(filter);
-            mAction = action;
-        }
-
-        @Override
-        public boolean perform(List<UiObject> nodes) {
-            if (nodes == null || nodes.isEmpty())
-                return false;
-            boolean succeed = true;
-            for (UiObject nodeInfo : nodes) {
-                if (!nodeInfo.performAction(mAction)) {
-                    succeed = false;
-                }
-            }
-            return succeed;
-        }
-    }
-
-    @Override
-    public String toString() {
-        return "FilterAction{" +
-                "mFilter=" + mFilter +
-                '}';
-    }
-}
diff --git a/automator/src/main/java/com/stardust/automator/simple_action/FilterAction.kt b/automator/src/main/java/com/stardust/automator/simple_action/FilterAction.kt
new file mode 100644
index 00000000..04d17c00
--- /dev/null
+++ b/automator/src/main/java/com/stardust/automator/simple_action/FilterAction.kt
@@ -0,0 +1,142 @@
+package com.stardust.automator.simple_action
+
+import android.graphics.Rect
+import com.stardust.automator.UiObject
+import java.util.*
+
+/**
+ * Created by Stardust on 2017/1/27.
+ */
+
+abstract class FilterAction(private val mFilter: Filter) : SimpleAction() {
+
+    abstract fun perform(nodes: List<UiObject>): Boolean
+
+    interface Filter {
+
+        fun filter(root: UiObject): List<UiObject>
+    }
+
+    class TextFilter(private var mText: String, internal var mIndex: Int) : Filter {
+
+        override fun filter(root: UiObject): List<UiObject> {
+            val list = root.findByText(mText)
+            if (mIndex == -1)
+                return list
+            return if (mIndex >= list.size) emptyList() else listOf(list[mIndex])
+        }
+
+        override fun toString(): String {
+            return "TextFilter{" +
+                    "mText='" + mText + '\''.toString() +
+                    ", mIndex=" + mIndex +
+                    '}'.toString()
+        }
+    }
+
+    class BoundsFilter(private var mBoundsInScreen: Rect) : Filter {
+
+        override fun filter(root: UiObject): List<UiObject> {
+            val list = ArrayList<UiObject>()
+            findAccessibilityNodeInfosByBounds(root, list)
+            return list
+        }
+
+        private fun findAccessibilityNodeInfosByBounds(root: UiObject?, list: MutableList<UiObject>) {
+            if (root == null)
+                return
+            val rect = Rect()
+            root.getBoundsInScreen(rect)
+            if (rect == mBoundsInScreen) {
+                list.add(root)
+            }
+            val oldSize = list.size
+            for (i in 0 until root.childCount) {
+                val child = root.child(i) ?: continue
+                findAccessibilityNodeInfosByBounds(child, list)
+            }
+            if (oldSize == list.size && rect.contains(mBoundsInScreen)) {
+                list.add(root)
+            }
+        }
+
+        override fun toString(): String {
+            return "BoundsFilter{" +
+                    "mBoundsInScreen=" + mBoundsInScreen +
+                    '}'.toString()
+        }
+    }
+
+    class EditableFilter(private val mIndex: Int) : Filter {
+
+        override fun filter(root: UiObject): List<UiObject> {
+            val editableList = findEditable(root)
+            if (mIndex == -1)
+                return editableList
+            return if (mIndex >= editableList.size) emptyList() else listOf(editableList[mIndex])
+        }
+
+        override fun toString(): String {
+            return "EditableFilter{" +
+                    "mIndex=" + mIndex +
+                    '}'.toString()
+        }
+
+        companion object {
+
+            fun findEditable(root: UiObject?): List<UiObject> {
+                if (root == null) {
+                    return emptyList()
+                }
+                if (root.isEditable) {
+                    return listOf(root)
+                }
+                val list = LinkedList<UiObject>()
+                for (i in 0 until root.childCount) {
+                    list.addAll(findEditable(root.child(i)))
+                }
+                return list
+            }
+        }
+    }
+
+    class IdFilter(private val mId: String) : Filter {
+
+        override fun filter(root: UiObject): List<UiObject> {
+            return root.findByViewId(mId)
+        }
+
+        override fun toString(): String {
+            return "IdFilter{" +
+                    "mId='" + mId + '\''.toString() +
+                    '}'.toString()
+        }
+    }
+
+    override fun perform(root: UiObject): Boolean {
+        val list = mFilter.filter(root)
+        return perform(list)
+    }
+
+
+    class SimpleFilterAction(private val mAction: Int, filter: Filter) : FilterAction(filter) {
+
+        override fun perform(nodes: List<UiObject>): Boolean {
+            if (nodes.isEmpty())
+                return false
+            var succeed = true
+            for (nodeInfo in nodes) {
+                if (!nodeInfo.performAction(mAction)) {
+                    succeed = false
+                }
+            }
+            return succeed
+        }
+    }
+
+    override fun toString(): String {
+        return "FilterAction{" +
+                "mFilter=" + mFilter +
+                '}'.toString()
+    }
+}
diff --git a/automator/src/main/java/com/stardust/automator/simple_action/ScrollAction.java b/automator/src/main/java/com/stardust/automator/simple_action/ScrollAction.java
deleted file mode 100644
index 96157371..00000000
--- a/automator/src/main/java/com/stardust/automator/simple_action/ScrollAction.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.stardust.automator.simple_action;
-
-import com.stardust.automator.UiObject;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Created by Stardust on 2017/2/12.
- */
-public class ScrollAction extends SimpleAction {
-
-    private int mIndex, mAction;
-
-    public ScrollAction(int action, int i) {
-        mAction = action;
-        mIndex = i;
-    }
-
-    @Override
-    public boolean perform(UiObject root) {
-        List<UiObject> scrollableNodes = findScrollableNodes(root);
-        boolean result = mIndex < scrollableNodes.size() && scrollableNodes.get(mIndex).performAction(mAction);
-        recycle(scrollableNodes, root);
-        return result;
-    }
-
-    private void recycle(List<UiObject> list, UiObject root) {
-        for (UiObject nodeInfo : list) {
-            if (nodeInfo != root)
-                nodeInfo.recycle();
-        }
-    }
-
-    private List<UiObject> findScrollableNodes(UiObject root) {
-        List<UiObject> list = new ArrayList<>();
-        if (root != null) {
-            findScrollableNodes(root, list);
-            if (root.isScrollable()) {
-                list.add(root);
-            }
-        }
-        return list;
-    }
-
-    private static void findScrollableNodes(UiObject node, List<UiObject> list) {
-        if (node == null) {
-            return;
-        }
-        for (int i = 0; i < node.getChildCount(); i++) {
-            UiObject child = node.child(i);
-            if (child == null)
-                continue;
-            findScrollableNodes(child, list);
-            if (child.isScrollable()) {
-                list.add(child);
-            } else {
-                child.recycle();
-            }
-        }
-    }
-}
diff --git a/automator/src/main/java/com/stardust/automator/simple_action/ScrollAction.kt b/automator/src/main/java/com/stardust/automator/simple_action/ScrollAction.kt
new file mode 100644
index 00000000..57166d3d
--- /dev/null
+++ b/automator/src/main/java/com/stardust/automator/simple_action/ScrollAction.kt
@@ -0,0 +1,51 @@
+package com.stardust.automator.simple_action
+
+import com.stardust.automator.UiObject
+
+import java.util.ArrayList
+
+/**
+ * Created by Stardust on 2017/2/12.
+ */
+class ScrollAction(private val mAction: Int, private val mIndex: Int) : SimpleAction() {
+
+    override fun perform(root: UiObject): Boolean {
+        val scrollableNodes = findScrollableNodes(root)
+        val result = mIndex < scrollableNodes.size && scrollableNodes[mIndex].performAction(mAction)
+        recycle(scrollableNodes, root)
+        return result
+    }
+
+    private fun recycle(list: List<UiObject>, root: UiObject) {
+        for (nodeInfo in list) {
+            if (nodeInfo !== root)
+                nodeInfo.recycle()
+        }
+    }
+
+    private fun findScrollableNodes(root: UiObject?): List<UiObject> {
+        val list = ArrayList<UiObject>()
+        if (root != null) {
+            findScrollableNodes(root, list)
+            if (root.isScrollable) {
+                list.add(root)
+            }
+        }
+        return list
+    }
+
+    private fun findScrollableNodes(node: UiObject?, list: MutableList<UiObject>) {
+        if (node == null) {
+            return
+        }
+        for (i in 0 until node.childCount) {
+            val child = node.child(i) ?: continue
+            findScrollableNodes(child, list)
+            if (child.isScrollable) {
+                list.add(child)
+            } else {
+                child.recycle()
+            }
+        }
+    }
+}
diff --git a/automator/src/main/java/com/stardust/automator/simple_action/ScrollMaxAction.java b/automator/src/main/java/com/stardust/automator/simple_action/ScrollMaxAction.java
deleted file mode 100644
index 6c2eb2f4..00000000
--- a/automator/src/main/java/com/stardust/automator/simple_action/ScrollMaxAction.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package com.stardust.automator.simple_action;
-
-import android.graphics.Rect;
-import android.util.Log;
-
-import com.stardust.automator.UiObject;
-
-import java.util.HashSet;
-import java.util.Set;
-
-/**
- * Created by Stardust on 2017/1/27.
- */
-
-public class ScrollMaxAction extends SimpleAction {
-
-    private static final String TAG = ScrollMaxAction.class.getSimpleName();
-    private int mScrollAction;
-    private UiObject mMaxScrollableNode;
-    private UiObject mRootNode;
-    private Set<UiObject> mRecycledMaxUiObjects = new HashSet<>();
-
-    public ScrollMaxAction(int scrollAction) {
-        mScrollAction = scrollAction;
-    }
-
-    @Override
-    public boolean perform(UiObject rootNodeInfo) {
-        reset();
-        mRootNode = rootNodeInfo;
-        findMaxScrollableNodeInfo(rootNodeInfo);
-        boolean result = mMaxScrollableNode != null && mMaxScrollableNode.performAction(mScrollAction);
-        reset();
-        return result;
-    }
-
-    private void reset() {
-        if (mMaxScrollableNode != null && mMaxScrollableNode != mRootNode) {
-            mMaxScrollableNode.recycle();
-        }
-        mMaxScrollableNode = mRootNode = null;
-        mRecycledMaxUiObjects.clear();
-    }
-
-    private void findMaxScrollableNodeInfo(UiObject nodeInfo) {
-        if (nodeInfo == null)
-            return;
-        if (nodeInfo.isScrollable()) {
-            if (mMaxScrollableNode == null) {
-                mMaxScrollableNode = nodeInfo;
-            } else if (getAreaInScreen(mMaxScrollableNode) < getAreaInScreen(nodeInfo)) {
-                if (mMaxScrollableNode != mRootNode) {
-                    mRecycledMaxUiObjects.add(mMaxScrollableNode);
-                    mMaxScrollableNode.recycle();
-                }
-                mMaxScrollableNode = nodeInfo;
-            }
-        }
-        for (int i = 0; i < nodeInfo.getChildCount(); i++) {
-            UiObject child = nodeInfo.child(i);
-            if (child != null) {
-                findMaxScrollableNodeInfo(child);
-                if (mMaxScrollableNode != child && !mRecycledMaxUiObjects.contains(child)) {
-                    child.recycle();
-                }
-            }
-        }
-    }
-
-    private long getAreaInScreen(UiObject nodeInfo) {
-        Rect rect = new Rect();
-        nodeInfo.getBoundsInScreen(rect);
-        long area = ((long) rect.width()) * rect.height();
-        Log.v(TAG, "area=" + area);
-        return area;
-    }
-
-}
diff --git a/automator/src/main/java/com/stardust/automator/simple_action/ScrollMaxAction.kt b/automator/src/main/java/com/stardust/automator/simple_action/ScrollMaxAction.kt
new file mode 100644
index 00000000..2983a204
--- /dev/null
+++ b/automator/src/main/java/com/stardust/automator/simple_action/ScrollMaxAction.kt
@@ -0,0 +1,79 @@
+package com.stardust.automator.simple_action
+
+import android.graphics.Rect
+import android.util.Log
+
+import com.stardust.automator.UiObject
+
+import java.util.HashSet
+
+/**
+ * Created by Stardust on 2017/1/27.
+ */
+
+class ScrollMaxAction(private val mScrollAction: Int) : SimpleAction() {
+    private var mMaxScrollableNode: UiObject? = null
+    private var mRootNode: UiObject? = null
+    private val mRecycledMaxUiObjects = HashSet<UiObject>()
+
+    override fun perform(root: UiObject): Boolean {
+        reset()
+        mRootNode = root
+        findMaxScrollableNodeInfo(root)
+        val result = mMaxScrollableNode != null && mMaxScrollableNode!!.performAction(mScrollAction)
+        reset()
+        return result
+    }
+
+    private fun reset() {
+        mMaxScrollableNode?.let {
+            if(it != mRootNode){
+                it.recycle()
+            }
+        }
+        mRootNode = null
+        mMaxScrollableNode = mRootNode
+        mRecycledMaxUiObjects.clear()
+    }
+
+    private fun findMaxScrollableNodeInfo(nodeInfo: UiObject?) {
+        if (nodeInfo == null)
+            return
+
+        if (nodeInfo.isScrollable) {
+            val maxScrollableNode = mMaxScrollableNode
+            if (maxScrollableNode == null) {
+                mMaxScrollableNode = nodeInfo
+            } else if (getAreaInScreen(maxScrollableNode) < getAreaInScreen(nodeInfo)) {
+                if (maxScrollableNode !== mRootNode) {
+                    mRecycledMaxUiObjects.add(maxScrollableNode)
+                    maxScrollableNode.recycle()
+                }
+                mMaxScrollableNode = nodeInfo
+            }
+        }
+        for (i in 0 until nodeInfo.childCount) {
+            val child = nodeInfo.child(i)
+            if (child != null) {
+                findMaxScrollableNodeInfo(child)
+                if (mMaxScrollableNode !== child && !mRecycledMaxUiObjects.contains(child)) {
+                    child.recycle()
+                }
+            }
+        }
+    }
+
+    private fun getAreaInScreen(nodeInfo: UiObject): Long {
+        val rect = Rect()
+        nodeInfo.getBoundsInScreen(rect)
+        val area = rect.width().toLong() * rect.height()
+        Log.v(TAG, "area=$area")
+        return area
+    }
+
+    companion object {
+
+        private val TAG = ScrollMaxAction::class.java.simpleName
+    }
+
+}
diff --git a/automator/src/main/java/com/stardust/automator/simple_action/SearchTargetAction.java b/automator/src/main/java/com/stardust/automator/simple_action/SearchTargetAction.java
deleted file mode 100644
index eb4aa053..00000000
--- a/automator/src/main/java/com/stardust/automator/simple_action/SearchTargetAction.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package com.stardust.automator.simple_action;
-
-import android.graphics.BitmapFactory;
-
-import com.stardust.automator.UiObject;
-
-import java.util.List;
-
-/**
- * Created by Stardust on 2017/1/27.
- */
-
-public abstract class SearchTargetAction extends FilterAction {
-
-    private int mAction;
-
-    public SearchTargetAction(int action, Filter filter) {
-        super(filter);
-        mAction = action;
-    }
-
-
-    @Override
-    public boolean perform(List<UiObject> nodes) {
-        boolean performed = false;
-        for (UiObject node : nodes) {
-            node = searchTarget(node);
-            if (node != null && performAction(node)) {
-                performed = true;
-            }
-        }
-        return performed;
-    }
-
-    protected boolean performAction(UiObject node) {
-        return node.performAction(mAction);
-    }
-
-    public int getAction() {
-        return mAction;
-    }
-
-    public UiObject searchTarget(UiObject node) {
-        return node;
-    }
-
-    @Override
-    public String toString() {
-        return "SearchTargetAction{" +
-                "mAction=" + mAction + ", " +
-                super.toString() +
-                "}";
-    }
-}
diff --git a/automator/src/main/java/com/stardust/automator/simple_action/SearchTargetAction.kt b/automator/src/main/java/com/stardust/automator/simple_action/SearchTargetAction.kt
new file mode 100644
index 00000000..7480664e
--- /dev/null
+++ b/automator/src/main/java/com/stardust/automator/simple_action/SearchTargetAction.kt
@@ -0,0 +1,38 @@
+package com.stardust.automator.simple_action
+
+import android.graphics.BitmapFactory
+
+import com.stardust.automator.UiObject
+
+/**
+ * Created by Stardust on 2017/1/27.
+ */
+
+abstract class SearchTargetAction(val action: Int, filter: FilterAction.Filter) : FilterAction(filter) {
+
+    override fun perform(nodes: List<UiObject>): Boolean {
+        var performed = false
+        for (node in nodes) {
+            val targetNode = searchTarget(node)
+            if (targetNode != null && performAction(targetNode)) {
+                performed = true
+            }
+        }
+        return performed
+    }
+
+    protected open fun performAction(node: UiObject): Boolean {
+        return node.performAction(action)
+    }
+
+    open fun searchTarget(node: UiObject?): UiObject? {
+        return node
+    }
+
+    override fun toString(): String {
+        return "SearchTargetAction{" +
+                "mAction=" + action + ", " +
+                super.toString() +
+                "}"
+    }
+}
diff --git a/automator/src/main/java/com/stardust/automator/simple_action/SearchUpTargetAction.java b/automator/src/main/java/com/stardust/automator/simple_action/SearchUpTargetAction.java
deleted file mode 100644
index c5e1ba89..00000000
--- a/automator/src/main/java/com/stardust/automator/simple_action/SearchUpTargetAction.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.stardust.automator.simple_action;
-
-
-import com.stardust.automator.UiObject;
-
-/**
- * Created by Stardust on 2017/1/27.
- */
-
-public class SearchUpTargetAction extends SearchTargetAction {
-
-    private static final String TAG = SearchUpTargetAction.class.getSimpleName();
-    private static final int LOOP_MAX = 20;
-    private Able mAble;
-
-    public SearchUpTargetAction(int action, Filter filter) {
-        super(action, filter);
-        mAble = Able.ABLE_MAP.get(action);
-    }
-
-    @Override
-    public UiObject searchTarget(UiObject n) {
-        UiObject node = n;
-        int i = 0;
-        while (node != null && !mAble.isAble(node)) {
-            i++;
-            if (i > LOOP_MAX) {
-                return null;
-            }
-            node = node.parent();
-        }
-        return node;
-    }
-
-    @Override
-    public String toString() {
-        return "SearchUpTargetAction{" +
-                "mAble=" + mAble + ", " +
-                super.toString() +
-                '}';
-    }
-}
diff --git a/automator/src/main/java/com/stardust/automator/simple_action/SearchUpTargetAction.kt b/automator/src/main/java/com/stardust/automator/simple_action/SearchUpTargetAction.kt
new file mode 100644
index 00000000..b02f091e
--- /dev/null
+++ b/automator/src/main/java/com/stardust/automator/simple_action/SearchUpTargetAction.kt
@@ -0,0 +1,38 @@
+package com.stardust.automator.simple_action
+
+
+import com.stardust.automator.UiObject
+
+/**
+ * Created by Stardust on 2017/1/27.
+ */
+
+class SearchUpTargetAction(action: Int, filter: FilterAction.Filter) : SearchTargetAction(action, filter) {
+    private val mAble: Able = Able.ABLE_MAP.get(action)
+
+    override fun searchTarget(n: UiObject?): UiObject? {
+        var node = n
+        var i = 0
+        while (node != null && !mAble.isAble(node)) {
+            i++
+            if (i > LOOP_MAX) {
+                return null
+            }
+            node = node.parent()
+        }
+        return node
+    }
+
+    override fun toString(): String {
+        return "SearchUpTargetAction{" +
+                "mAble=" + mAble + ", " +
+                super.toString() +
+                '}'.toString()
+    }
+
+    companion object {
+
+        private val TAG = SearchUpTargetAction::class.java!!.getSimpleName()
+        private val LOOP_MAX = 20
+    }
+}
diff --git a/automator/src/main/java/com/stardust/automator/simple_action/SimpleAction.java b/automator/src/main/java/com/stardust/automator/simple_action/SimpleAction.java
deleted file mode 100644
index b660ec16..00000000
--- a/automator/src/main/java/com/stardust/automator/simple_action/SimpleAction.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.stardust.automator.simple_action;
-
-import com.stardust.automator.UiObject;
-
-/**
- * Created by Stardust on 2017/1/27.
- */
-
-public abstract class SimpleAction {
-
-    private volatile boolean mValid = true;
-    private volatile boolean mResult = false;
-
-    public abstract boolean perform(UiObject root);
-
-    public boolean getResult() {
-        return mResult;
-    }
-
-    public void setResult(boolean result) {
-        mResult = result;
-    }
-
-    public void setValid(boolean valid) {
-        mValid = valid;
-    }
-
-    public boolean isValid() {
-        return mValid;
-    }
-
-}
diff --git a/automator/src/main/java/com/stardust/automator/simple_action/SimpleAction.kt b/automator/src/main/java/com/stardust/automator/simple_action/SimpleAction.kt
new file mode 100644
index 00000000..f7492c55
--- /dev/null
+++ b/automator/src/main/java/com/stardust/automator/simple_action/SimpleAction.kt
@@ -0,0 +1,18 @@
+package com.stardust.automator.simple_action
+
+import com.stardust.automator.UiObject
+
+/**
+ * Created by Stardust on 2017/1/27.
+ */
+
+abstract class SimpleAction {
+
+    @Volatile
+    var isValid = true
+    @Volatile
+    var result = false
+
+    abstract fun perform(root: UiObject): Boolean
+
+}
diff --git a/automator/src/main/java/com/stardust/automator/test/TestUiObject.java b/automator/src/main/java/com/stardust/automator/test/TestUiObject.java
deleted file mode 100644
index 9621d144..00000000
--- a/automator/src/main/java/com/stardust/automator/test/TestUiObject.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package com.stardust.automator.test;
-
-import android.graphics.Rect;
-import android.os.Bundle;
-import android.util.Log;
-
-import com.stardust.automator.UiObject;
-
-import java.util.Arrays;
-import java.util.Random;
-
-/**
- * Created by Stardust on 2017/5/5.
- */
-
-public class TestUiObject extends UiObject {
-
-    public static int count = 0;
-    public static int max = 0;
-    private static Random random = new Random();
-
-    private int mHashCode = random.nextInt();
-    private boolean mRecycled = false;
-    private int mChildCount;
-
-    public TestUiObject(int i) {
-        super(null);
-        count++;
-        max = Math.max(max, count);
-        mChildCount = i;
-    }
-
-
-    public TestUiObject() {
-        this(Math.max(0, random.nextInt(6) - 2));
-    }
-
-    @Override
-    public UiObject child(int i) {
-        return new TestUiObject();
-    }
-
-    @Override
-    public UiObject parent() {
-        return new TestUiObject();
-    }
-
-    @Override
-    public int getChildCount() {
-        return mChildCount;
-    }
-
-    @Override
-    public boolean isScrollable() {
-        return random.nextInt(4) == 0;
-    }
-
-    @Override
-    public boolean isClickable() {
-        return random.nextBoolean();
-    }
-
-    @Override
-    public void getBoundsInScreen(Rect outBounds) {
-        int left = random.nextInt(1080);
-        int top = random.nextInt(1920);
-        int right = random.nextInt(1080 - left) + left;
-        int bottom = random.nextInt(1920 - top) + top;
-        outBounds.set(left, top, right, bottom);
-    }
-
-    @Override
-    public boolean performAction(int action, Bundle bundle) {
-        return random.nextBoolean();
-    }
-
-    @Override
-    public boolean performAction(int action) {
-        return random.nextBoolean();
-    }
-
-    @Override
-    public void recycle() {
-        if (mRecycled) {
-            throw new IllegalStateException();
-        }
-        mRecycled = true;
-        count--;
-    }
-
-    @Override
-    public String toString() {
-        return "UiObject@" + Integer.toHexString(hashCode());
-    }
-
-    @Override
-    public int hashCode() {
-        return mHashCode;
-    }
-}
diff --git a/automator/src/main/java/com/stardust/automator/test/TestUiObject.kt b/automator/src/main/java/com/stardust/automator/test/TestUiObject.kt
new file mode 100644
index 00000000..1e37b809
--- /dev/null
+++ b/automator/src/main/java/com/stardust/automator/test/TestUiObject.kt
@@ -0,0 +1,85 @@
+package com.stardust.automator.test
+
+import android.graphics.Rect
+import android.os.Bundle
+import android.view.accessibility.AccessibilityNodeInfo
+import com.stardust.automator.UiObject
+import java.util.*
+
+/**
+ * Created by Stardust on 2017/5/5.
+ */
+
+class TestUiObject @JvmOverloads constructor(private val mChildCount: Int = Math.max(0, random.nextInt(6) - 2)) : UiObject(null) {
+
+    private val mHashCode = random.nextInt()
+    private var mRecycled = false
+
+    init {
+        count++
+        max = Math.max(max, count)
+    }
+
+    override fun child(i: Int): UiObject? {
+        return TestUiObject()
+    }
+
+    override fun parent(): UiObject? {
+        return TestUiObject()
+    }
+
+    override fun getChildCount(): Int {
+        return mChildCount
+    }
+
+    override fun isScrollable(): Boolean {
+        return random.nextInt(4) == 0
+    }
+
+    override fun isClickable(): Boolean {
+        return random.nextBoolean()
+    }
+
+    override fun getBoundsInScreen(outBounds: Rect) {
+        val left = random.nextInt(1080)
+        val top = random.nextInt(1920)
+        val right = random.nextInt(1080 - left) + left
+        val bottom = random.nextInt(1920 - top) + top
+        outBounds.set(left, top, right, bottom)
+    }
+
+    override fun performAction(action: Int, bundle: Bundle): Boolean {
+        return random.nextBoolean()
+    }
+
+    override fun performAction(action: Int): Boolean {
+        return random.nextBoolean()
+    }
+
+    override fun recycle() {
+        if (mRecycled) {
+            throw IllegalStateException()
+        }
+        mRecycled = true
+        count--
+    }
+
+    override fun toString(): String {
+        return "UiObject@" + Integer.toHexString(hashCode())
+    }
+
+    override fun hashCode(): Int {
+        return mHashCode
+    }
+
+    override fun equals(other: Any?): Boolean {
+        return this === other
+    }
+
+    companion object {
+
+        var count = 0
+        var max = 0
+        private val random = Random()
+    }
+}
diff --git a/automator/src/main/java/com/stardust/notification/Notification.java b/automator/src/main/java/com/stardust/notification/Notification.java
deleted file mode 100644
index 4a523d23..00000000
--- a/automator/src/main/java/com/stardust/notification/Notification.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package com.stardust.notification;
-
-import android.app.PendingIntent;
-import android.os.Build;
-import android.os.Parcel;
-import android.support.annotation.RequiresApi;
-
-/**
- * Created by Stardust on 2017/10/30.
- */
-
-public class Notification extends android.app.Notification {
-
-    private String mPackageName;
-
-    private Notification(String packageName) {
-        mPackageName = packageName;
-    }
-
-    public static Notification create(android.app.Notification n, String packageName) {
-        Notification notification = new Notification(packageName);
-        clone(n, notification);
-        return notification;
-    }
-
-    public String getPackageName() {
-        return mPackageName;
-    }
-
-    @RequiresApi(api = Build.VERSION_CODES.KITKAT)
-    public String getText() {
-        return extras.getString(EXTRA_TEXT);
-    }
-
-    @RequiresApi(api = Build.VERSION_CODES.KITKAT)
-    public String getTitle() {
-        return extras.getString(EXTRA_TITLE);
-    }
-
-    public void click() {
-        try {
-            this.contentIntent.send();
-        } catch (PendingIntent.CanceledException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    public void delete() {
-        try {
-            this.deleteIntent.send();
-        } catch (PendingIntent.CanceledException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    @Override
-    public String toString() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
-            return "Notification{" +
-                    "packageName='" + mPackageName + "', " +
-                    "title='" + getTitle() + ", " +
-                    "text='" + getText() + "'" +
-                    "} ";
-        }
-        return super.toString();
-    }
-
-    public static void clone(android.app.Notification from, android.app.Notification to) {
-        to.when = from.when;
-        to.icon = from.icon;
-        to.iconLevel = from.iconLevel;
-        to.number = from.number;
-        to.contentIntent = from.contentIntent;
-        to.deleteIntent = from.deleteIntent;
-        to.fullScreenIntent = from.fullScreenIntent;
-        to.tickerText = from.tickerText;
-        to.tickerView = from.tickerView;
-        to.contentView = from.contentView;
-        to.bigContentView = from.bigContentView;
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            to.headsUpContentView = from.headsUpContentView;
-            to.audioAttributes = from.audioAttributes;
-            to.color = from.color;
-            to.visibility = from.visibility;
-            to.category = from.category;
-            to.publicVersion = from.publicVersion;
-        }
-        to.largeIcon = from.largeIcon;
-        to.sound = from.sound;
-        to.audioStreamType = from.audioStreamType;
-        to.vibrate = from.vibrate;
-        to.ledARGB = from.ledARGB;
-        to.ledOnMS = from.ledOnMS;
-        to.ledOffMS = from.ledOffMS;
-        to.defaults = from.defaults;
-        to.flags = from.flags;
-        to.priority = from.priority;
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
-            to.extras = from.extras;
-            to.actions = from.actions;
-        }
-    }
-
-}
diff --git a/automator/src/main/java/com/stardust/notification/Notification.kt b/automator/src/main/java/com/stardust/notification/Notification.kt
new file mode 100644
index 00000000..ab91ef5f
--- /dev/null
+++ b/automator/src/main/java/com/stardust/notification/Notification.kt
@@ -0,0 +1,96 @@
+package com.stardust.notification
+
+import android.app.PendingIntent
+import android.os.Build
+import android.os.Parcel
+import androidx.annotation.RequiresApi
+
+/**
+ * Created by Stardust on 2017/10/30.
+ */
+
+class Notification private constructor(val packageName: String) : android.app.Notification() {
+
+    val text: String?
+        @RequiresApi(api = Build.VERSION_CODES.KITKAT)
+        get() = extras.getString(EXTRA_TEXT)
+
+    val title: String?
+        @RequiresApi(api = Build.VERSION_CODES.KITKAT)
+        get() = extras.getString(EXTRA_TITLE)
+
+    fun click() {
+        try {
+            this.contentIntent.send()
+        } catch (e: PendingIntent.CanceledException) {
+            throw RuntimeException(e)
+        }
+
+    }
+
+    fun delete() {
+        try {
+            this.deleteIntent.send()
+        } catch (e: PendingIntent.CanceledException) {
+            throw RuntimeException(e)
+        }
+
+    }
+
+    override fun toString(): String {
+        return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+            "Notification{" +
+                    "packageName='" + packageName + "', " +
+                    "title='" + title + ", " +
+                    "text='" + text + "'" +
+                    "} "
+        } else super.toString()
+    }
+
+    companion object {
+
+        fun create(n: android.app.Notification, packageName: String): Notification {
+            val notification = Notification(packageName)
+            clone(n, notification)
+            return notification
+        }
+
+        @Suppress("DEPRECATION")
+        fun clone(from: android.app.Notification, to: android.app.Notification) {
+            to.`when` = from.`when`
+            to.icon = from.icon
+            to.iconLevel = from.iconLevel
+            to.number = from.number
+            to.contentIntent = from.contentIntent
+            to.deleteIntent = from.deleteIntent
+            to.fullScreenIntent = from.fullScreenIntent
+            to.tickerText = from.tickerText
+            to.tickerView = from.tickerView
+            to.contentView = from.contentView
+            to.bigContentView = from.bigContentView
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+                to.headsUpContentView = from.headsUpContentView
+                to.audioAttributes = from.audioAttributes
+                to.color = from.color
+                to.visibility = from.visibility
+                to.category = from.category
+                to.publicVersion = from.publicVersion
+            }
+            to.largeIcon = from.largeIcon
+            to.sound = from.sound
+            to.audioStreamType = from.audioStreamType
+            to.vibrate = from.vibrate
+            to.ledARGB = from.ledARGB
+            to.ledOnMS = from.ledOnMS
+            to.ledOffMS = from.ledOffMS
+            to.defaults = from.defaults
+            to.flags = from.flags
+            to.priority = from.priority
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+                to.extras = from.extras
+                to.actions = from.actions
+            }
+        }
+    }
+
+}
diff --git a/automator/src/main/java/com/stardust/notification/NotificationListenerService.java b/automator/src/main/java/com/stardust/notification/NotificationListenerService.java
deleted file mode 100644
index 242568a4..00000000
--- a/automator/src/main/java/com/stardust/notification/NotificationListenerService.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package com.stardust.notification;
-
-import android.app.Notification;
-import android.os.Build;
-import android.os.Parcel;
-import android.service.notification.StatusBarNotification;
-import android.support.annotation.RequiresApi;
-
-import com.stardust.view.accessibility.NotificationListener;
-
-import java.util.List;
-import java.util.concurrent.CopyOnWriteArrayList;
-
-/**
- * Created by Stardust on 2017/10/30.
- */
-
-@RequiresApi(api = Build.VERSION_CODES.JELLY_BEAN_MR2)
-public class NotificationListenerService extends android.service.notification.NotificationListenerService {
-
-    private CopyOnWriteArrayList<NotificationListener> mNotificationListeners = new CopyOnWriteArrayList<>();
-    private static NotificationListenerService sInstance;
-
-    @Override
-    public void onCreate() {
-        super.onCreate();
-        sInstance = this;
-    }
-
-    public static NotificationListenerService getInstance() {
-        return sInstance;
-    }
-
-    @Override
-    public void onNotificationPosted(StatusBarNotification sbn, RankingMap rankingMap) {
-        onNotificationPosted(sbn);
-    }
-
-    @Override
-    public void onNotificationPosted(StatusBarNotification sbn) {
-        for (NotificationListener listener : mNotificationListeners) {
-            listener.onNotification(com.stardust.notification.Notification.create(
-                    sbn.getNotification(), sbn.getPackageName()));
-        }
-    }
-
-    @Override
-    public void onNotificationRemoved(StatusBarNotification sbn) {
-    }
-
-    @Override
-    public void onNotificationRemoved(StatusBarNotification sbn, RankingMap rankingMap) {
-    }
-
-    public void addListener(NotificationListener listener) {
-        mNotificationListeners.add(listener);
-    }
-
-    public boolean removeListener(NotificationListener listener) {
-        return mNotificationListeners.remove(listener);
-    }
-
-
-    @Override
-    public void onDestroy() {
-        super.onDestroy();
-        sInstance = null;
-    }
-}
diff --git a/automator/src/main/java/com/stardust/notification/NotificationListenerService.kt b/automator/src/main/java/com/stardust/notification/NotificationListenerService.kt
new file mode 100644
index 00000000..103b86cd
--- /dev/null
+++ b/automator/src/main/java/com/stardust/notification/NotificationListenerService.kt
@@ -0,0 +1,59 @@
+package com.stardust.notification
+
+import android.app.Notification
+import android.os.Build
+import android.os.Parcel
+import android.service.notification.StatusBarNotification
+import androidx.annotation.RequiresApi
+
+import com.stardust.view.accessibility.NotificationListener
+import java.util.concurrent.CopyOnWriteArrayList
+
+/**
+ * Created by Stardust on 2017/10/30.
+ */
+
+@RequiresApi(api = Build.VERSION_CODES.JELLY_BEAN_MR2)
+class NotificationListenerService : android.service.notification.NotificationListenerService() {
+
+    private val mNotificationListeners = CopyOnWriteArrayList<NotificationListener>()
+
+    override fun onCreate() {
+        super.onCreate()
+        instance = this
+    }
+
+    override fun onNotificationPosted(sbn: StatusBarNotification, rankingMap: RankingMap) {
+        onNotificationPosted(sbn)
+    }
+
+    override fun onNotificationPosted(sbn: StatusBarNotification) {
+        for (listener in mNotificationListeners) {
+            listener.onNotification(com.stardust.notification.Notification.create(
+                    sbn.notification, sbn.packageName))
+        }
+    }
+
+    override fun onNotificationRemoved(sbn: StatusBarNotification) {}
+
+    override fun onNotificationRemoved(sbn: StatusBarNotification, rankingMap: RankingMap) {}
+
+    fun addListener(listener: NotificationListener) {
+        mNotificationListeners.add(listener)
+    }
+
+    fun removeListener(listener: NotificationListener): Boolean {
+        return mNotificationListeners.remove(listener)
+    }
+
+
+    override fun onDestroy() {
+        super.onDestroy()
+        instance = null
+    }
+
+    companion object {
+        var instance: NotificationListenerService? = null
+            private set
+    }
+}
diff --git a/automator/src/main/java/com/stardust/view/accessibility/AccessibilityDelegate.java b/automator/src/main/java/com/stardust/view/accessibility/AccessibilityDelegate.java
deleted file mode 100644
index c99d53cf..00000000
--- a/automator/src/main/java/com/stardust/view/accessibility/AccessibilityDelegate.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.stardust.view.accessibility;
-
-import android.accessibilityservice.AccessibilityService;
-import android.support.annotation.Nullable;
-import android.view.accessibility.AccessibilityEvent;
-import android.view.accessibility.AccessibilityNodeInfo;
-
-import java.util.List;
-import java.util.Set;
-
-/**
- * Created by Stardust on 2017/2/14.
- */
-
-public interface AccessibilityDelegate {
-
-    Set<Integer> ALL_EVENT_TYPES = null;
-
-    boolean onAccessibilityEvent(AccessibilityService service, AccessibilityEvent event);
-
-    /**
-     * 返回调用onAccessibilityEvent时的EventType的集合。如果需要对所有EventType都有效，返回null。
-     *
-     * @return
-     */
-    @Nullable
-    Set<Integer> getEventTypes();
-
-}
diff --git a/automator/src/main/java/com/stardust/view/accessibility/AccessibilityDelegate.kt b/automator/src/main/java/com/stardust/view/accessibility/AccessibilityDelegate.kt
new file mode 100644
index 00000000..7326e77c
--- /dev/null
+++ b/automator/src/main/java/com/stardust/view/accessibility/AccessibilityDelegate.kt
@@ -0,0 +1,27 @@
+package com.stardust.view.accessibility
+
+import android.accessibilityservice.AccessibilityService
+import android.view.accessibility.AccessibilityEvent
+import android.view.accessibility.AccessibilityNodeInfo
+
+/**
+ * Created by Stardust on 2017/2/14.
+ */
+
+interface AccessibilityDelegate {
+
+    /**
+     * 返回调用onAccessibilityEvent时的EventType的集合。如果需要对所有EventType都有效，返回null。
+     *
+     * @return
+     */
+    val eventTypes: Set<Int>?
+
+    fun onAccessibilityEvent(service: AccessibilityService, event: AccessibilityEvent): Boolean
+
+    companion object {
+
+        val ALL_EVENT_TYPES: Set<Int>? = null
+    }
+
+}
diff --git a/automator/src/main/java/com/stardust/view/accessibility/AccessibilityInfoProvider.java b/automator/src/main/java/com/stardust/view/accessibility/AccessibilityInfoProvider.java
deleted file mode 100644
index 4851ee3b..00000000
--- a/automator/src/main/java/com/stardust/view/accessibility/AccessibilityInfoProvider.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package com.stardust.view.accessibility;
-
-import android.accessibilityservice.AccessibilityService;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.pm.ActivityInfo;
-import android.content.pm.PackageManager;
-import android.view.accessibility.AccessibilityEvent;
-import android.view.accessibility.AccessibilityNodeInfo;
-
-import com.stardust.view.accessibility.AccessibilityDelegate;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
-
-/**
- * Created by Stardust on 2017/3/9.
- */
-
-public class AccessibilityInfoProvider implements AccessibilityDelegate {
-
-
-    private volatile String mLatestPackage = "";
-    private volatile String mLatestActivity = "";
-    private PackageManager mPackageManager;
-
-    public AccessibilityInfoProvider(PackageManager packageManager) {
-        mPackageManager = packageManager;
-    }
-
-    public String getLatestPackage() {
-        return mLatestPackage;
-    }
-
-    public String getLatestActivity() {
-        return mLatestActivity;
-    }
-
-    @Override
-    public boolean onAccessibilityEvent(AccessibilityService service, AccessibilityEvent event) {
-        if (event.getEventType() == AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED) {
-            setLatestComponent(event.getPackageName(), event.getClassName());
-        }
-        return false;
-    }
-
-    @Override
-    public Set<Integer> getEventTypes() {
-        return ALL_EVENT_TYPES;
-    }
-
-    private void setLatestComponent(CharSequence latestPackage, CharSequence latestClass) {
-        if (latestPackage == null || latestClass == null)
-            return;
-        String latestPackageStr = latestPackage.toString();
-        String latestClassStr = latestClass.toString();
-        if (latestClassStr.startsWith("android.view.") || latestClassStr.startsWith("android.widget."))
-            return;
-        try {
-            ComponentName componentName = new ComponentName(latestPackageStr, latestClassStr);
-            mLatestActivity = mPackageManager.getActivityInfo(componentName, PackageManager.MATCH_DEFAULT_ONLY).name;
-        } catch (PackageManager.NameNotFoundException ignored) {
-            return;
-        }
-        mLatestPackage = latestPackage.toString();
-    }
-}
diff --git a/automator/src/main/java/com/stardust/view/accessibility/AccessibilityInfoProvider.kt b/automator/src/main/java/com/stardust/view/accessibility/AccessibilityInfoProvider.kt
new file mode 100644
index 00000000..8d6892a4
--- /dev/null
+++ b/automator/src/main/java/com/stardust/view/accessibility/AccessibilityInfoProvider.kt
@@ -0,0 +1,87 @@
+package com.stardust.view.accessibility
+
+import android.accessibilityservice.AccessibilityService
+import android.app.AppOpsManager
+import android.app.usage.UsageStatsManager
+import android.content.ComponentName
+import android.content.Context
+import android.content.pm.PackageManager
+import android.os.Build
+import android.view.accessibility.AccessibilityEvent
+import androidx.annotation.RequiresApi
+import com.stardust.app.isOpPermissionGranted
+
+/**
+ * Created by Stardust on 2017/3/9.
+ */
+
+class AccessibilityInfoProvider(private val context: Context) : AccessibilityDelegate {
+
+    private val mPackageManager: PackageManager = context.packageManager
+
+    @Volatile
+    private var mLatestPackage: String = ""
+
+    val latestPackage: String
+        get() {
+            if (useUsageStats && Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP_MR1) {
+                mLatestPackage = getLatestPackageByUsageStats()
+            }
+            return mLatestPackage
+        }
+
+    @Volatile
+    var latestActivity = ""
+        private set
+
+    var useUsageStats: Boolean = false
+
+    override val eventTypes: Set<Int>?
+        get() = AccessibilityDelegate.ALL_EVENT_TYPES
+
+    override fun onAccessibilityEvent(service: AccessibilityService, event: AccessibilityEvent): Boolean {
+        if (event.eventType == AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED) {
+            setLatestComponent(event.packageName, event.className)
+        }
+        return false
+    }
+
+    fun getLatestPackageByUsageStatsIfGranted(): String {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP_MR1 && context.isOpPermissionGranted(AppOpsManager.OPSTR_GET_USAGE_STATS)) {
+            return getLatestPackageByUsageStats()
+        }
+        return mLatestPackage
+    }
+
+    @RequiresApi(Build.VERSION_CODES.LOLLIPOP_MR1)
+    fun getLatestPackageByUsageStats(): String {
+        val usageStatsManager = context.getSystemService(Context.USAGE_STATS_SERVICE) as UsageStatsManager
+        val current = System.currentTimeMillis()
+        val usageStats = usageStatsManager.queryUsageStats(UsageStatsManager.INTERVAL_BEST, current - 60 * 60 * 1000, current)
+        return if (usageStats.isEmpty()) {
+            mLatestPackage
+        } else {
+            usageStats.sortBy {
+                it.lastTimeStamp
+            }
+            usageStats.last().packageName
+        }
+
+    }
+
+    private fun setLatestComponent(latestPackage: CharSequence?, latestClass: CharSequence?) {
+        if (latestPackage == null || latestClass == null)
+            return
+        val latestPackageStr = latestPackage.toString()
+        val latestClassStr = latestClass.toString()
+        if (latestClassStr.startsWith("android.view.") || latestClassStr.startsWith("android.widget."))
+            return
+        try {
+            val componentName = ComponentName(latestPackageStr, latestClassStr)
+            latestActivity = mPackageManager.getActivityInfo(componentName, PackageManager.MATCH_DEFAULT_ONLY).name
+        } catch (ignored: PackageManager.NameNotFoundException) {
+            return
+        }
+        mLatestPackage = latestPackage.toString()
+    }
+}
diff --git a/automator/src/main/java/com/stardust/view/accessibility/AccessibilityNodeInfoAllocator.java b/automator/src/main/java/com/stardust/view/accessibility/AccessibilityNodeInfoAllocator.java
deleted file mode 100644
index ee4b54d0..00000000
--- a/automator/src/main/java/com/stardust/view/accessibility/AccessibilityNodeInfoAllocator.java
+++ /dev/null
@@ -1,198 +0,0 @@
-package com.stardust.view.accessibility;
-
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat;
-import android.util.Log;
-import android.view.accessibility.AccessibilityNodeInfo;
-
-import com.stardust.automator.BuildConfig;
-
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Created by Stardust on 2017/3/22.
- */
-
-public class AccessibilityNodeInfoAllocator {
-
-    public static final AccessibilityNodeInfoAllocator NONE = new NoOpAllocator();
-
-    private static final String TAG = "AccessibilityAllocator";
-    private static final boolean DEBUG = BuildConfig.DEBUG;
-
-
-    private static final AccessibilityNodeInfoAllocator GLOBAL = new AccessibilityNodeInfoAllocator();
-
-    public static AccessibilityNodeInfoAllocator getGlobal() {
-        return GLOBAL;
-    }
-
-    private Map<AccessibilityNodeInfo, String> mAccessibilityNodeInfoList = new HashMap<>();
-
-    public AccessibilityNodeInfo getChild(AccessibilityNodeInfo parent, int i) {
-        return add(parent.getChild(i));
-    }
-
-    public AccessibilityNodeInfoCompat getChild(AccessibilityNodeInfoCompat parent, int i) {
-        AccessibilityNodeInfoCompat compat = parent.getChild(i);
-        add((AccessibilityNodeInfo) compat.getInfo());
-        return compat;
-    }
-
-    public AccessibilityNodeInfo getParent(AccessibilityNodeInfo n) {
-        return add(n.getParent());
-    }
-
-
-    public AccessibilityNodeInfoCompat getParent(AccessibilityNodeInfoCompat n) {
-        AccessibilityNodeInfoCompat compat = n.getParent();
-        add((AccessibilityNodeInfo) compat.getInfo());
-        return compat;
-    }
-
-    public List<AccessibilityNodeInfo> findAccessibilityNodeInfosByText(AccessibilityNodeInfo root, String text) {
-        List<AccessibilityNodeInfo> list = root.findAccessibilityNodeInfosByText(text);
-        addAll(list);
-        return list;
-    }
-
-
-    public List<AccessibilityNodeInfoCompat> findAccessibilityNodeInfosByText(AccessibilityNodeInfoCompat root, String text) {
-        List<AccessibilityNodeInfoCompat> list = root.findAccessibilityNodeInfosByText(text);
-        addAll(list);
-        return list;
-    }
-
-    public List<AccessibilityNodeInfo> findAccessibilityNodeInfosByViewId(AccessibilityNodeInfo root, String id) {
-        List<AccessibilityNodeInfo> list = root.findAccessibilityNodeInfosByViewId(id);
-        addAll(list);
-        return list;
-    }
-
-
-    public List<AccessibilityNodeInfoCompat> findAccessibilityNodeInfosByViewId(AccessibilityNodeInfoCompat root, String id) {
-        List<AccessibilityNodeInfoCompat> list = root.findAccessibilityNodeInfosByViewId(id);
-        addAll(list);
-        return list;
-    }
-
-    public void recycle(AccessibilityNodeInfo nodeInfo) {
-        nodeInfo.recycle();
-        mAccessibilityNodeInfoList.remove(nodeInfo);
-    }
-
-    public void recycle(AccessibilityNodeInfoCompat nodeInfo) {
-        recycle((AccessibilityNodeInfo) nodeInfo.getInfo());
-    }
-
-    public int recycleAll() {
-        int notRecycledCount = 0;
-        int size = mAccessibilityNodeInfoList.size();
-        for (Map.Entry<AccessibilityNodeInfo, String> pair : mAccessibilityNodeInfoList.entrySet()) {
-            try {
-                pair.getKey().recycle();
-                notRecycledCount++;
-                if (DEBUG)
-                    Log.w(TAG, pair.getValue());
-            } catch (IllegalStateException ignored) {
-            }
-        }
-        Log.v(TAG, "Total: " + size + " Not recycled: " + notRecycledCount);
-        return notRecycledCount;
-    }
-
-    public AccessibilityNodeInfo add(@Nullable AccessibilityNodeInfo nodeInfo) {
-        String stackTrace = DEBUG ? Arrays.toString(Thread.currentThread().getStackTrace()) : null;
-        if (nodeInfo != null)
-            mAccessibilityNodeInfoList.put(nodeInfo, stackTrace);
-        return nodeInfo;
-    }
-
-    private void addAll(Collection<?> nodeInfos) {
-        String stackTrace = DEBUG ? Arrays.toString(Thread.currentThread().getStackTrace()) : null;
-        for (Object nodeInfo : nodeInfos) {
-            if (nodeInfo instanceof AccessibilityNodeInfo) {
-                mAccessibilityNodeInfoList.put((AccessibilityNodeInfo) nodeInfo, stackTrace);
-            } else if (nodeInfo instanceof AccessibilityNodeInfoCompat) {
-                mAccessibilityNodeInfoList.put((AccessibilityNodeInfo) ((AccessibilityNodeInfoCompat) nodeInfo).getInfo(), stackTrace);
-            }
-        }
-    }
-
-    public static void recycleList(AccessibilityNodeInfo root, List<AccessibilityNodeInfo> list) {
-        for (AccessibilityNodeInfo nodeInfo : list) {
-            if (nodeInfo != root && nodeInfo != null) {
-                //// FIXME: 2017/5/1 Issue #180
-                nodeInfo.recycle();
-            }
-        }
-    }
-
-    private static class NoOpAllocator extends AccessibilityNodeInfoAllocator {
-
-        @Override
-        public AccessibilityNodeInfoCompat getParent(AccessibilityNodeInfoCompat n) {
-            return n.getParent();
-        }
-
-        @Override
-        public AccessibilityNodeInfo getParent(AccessibilityNodeInfo n) {
-            return n.getParent();
-        }
-
-        @Override
-        public AccessibilityNodeInfoCompat getChild(AccessibilityNodeInfoCompat parent, int i) {
-            return parent.getChild(i);
-        }
-
-        @Override
-        public AccessibilityNodeInfo getChild(AccessibilityNodeInfo parent, int i) {
-            return parent.getChild(i);
-        }
-
-        @Override
-        public List<AccessibilityNodeInfoCompat> findAccessibilityNodeInfosByViewId(AccessibilityNodeInfoCompat root, String id) {
-            return root.findAccessibilityNodeInfosByViewId(id);
-        }
-
-
-        @Override
-        public List<AccessibilityNodeInfo> findAccessibilityNodeInfosByViewId(AccessibilityNodeInfo root, String id) {
-            return root.findAccessibilityNodeInfosByViewId(id);
-        }
-
-        @Override
-        public List<AccessibilityNodeInfo> findAccessibilityNodeInfosByText(AccessibilityNodeInfo root, String text) {
-            return root.findAccessibilityNodeInfosByText(text);
-        }
-
-        @Override
-        public List<AccessibilityNodeInfoCompat> findAccessibilityNodeInfosByText(AccessibilityNodeInfoCompat root, String text) {
-            return root.findAccessibilityNodeInfosByText(text);
-        }
-
-        @Override
-        public void recycle(AccessibilityNodeInfo nodeInfo) {
-            super.recycle(nodeInfo);
-        }
-
-        @Override
-        public void recycle(AccessibilityNodeInfoCompat nodeInfo) {
-            super.recycle(nodeInfo);
-        }
-
-        @Override
-        public int recycleAll() {
-            return -1;
-        }
-
-
-    }
-
-
-}
diff --git a/automator/src/main/java/com/stardust/view/accessibility/AccessibilityNodeInfoAllocator.kt b/automator/src/main/java/com/stardust/view/accessibility/AccessibilityNodeInfoAllocator.kt
new file mode 100644
index 00000000..fa3ede4f
--- /dev/null
+++ b/automator/src/main/java/com/stardust/view/accessibility/AccessibilityNodeInfoAllocator.kt
@@ -0,0 +1,186 @@
+package com.stardust.view.accessibility
+
+import android.os.Build
+import androidx.annotation.RequiresApi
+import androidx.core.view.accessibility.AccessibilityNodeInfoCompat
+import android.util.Log
+import android.view.accessibility.AccessibilityNodeInfo
+
+import com.stardust.automator.BuildConfig
+
+import java.util.Arrays
+import java.util.HashMap
+
+/**
+ * Created by Stardust on 2017/3/22.
+ */
+
+open class AccessibilityNodeInfoAllocator {
+
+    private val mAccessibilityNodeInfoList = HashMap<AccessibilityNodeInfo, String?>()
+
+    open fun getChild(parent: AccessibilityNodeInfo, i: Int): AccessibilityNodeInfo? {
+        return add(parent.getChild(i))
+    }
+
+    open fun getChild(parent: AccessibilityNodeInfoCompat, i: Int): AccessibilityNodeInfoCompat {
+        val compat = parent.getChild(i)
+        add(compat.info as AccessibilityNodeInfo)
+        return compat
+    }
+
+    open fun getParent(n: AccessibilityNodeInfo): AccessibilityNodeInfo? {
+        return add(n.parent)
+    }
+
+
+    open fun getParent(n: AccessibilityNodeInfoCompat): AccessibilityNodeInfoCompat {
+        val compat = n.parent
+        add(compat.info as AccessibilityNodeInfo)
+        return compat
+    }
+
+    open fun findAccessibilityNodeInfosByText(root: AccessibilityNodeInfo, text: String): List<AccessibilityNodeInfo> {
+        val list = root.findAccessibilityNodeInfosByText(text)
+        addAll(list)
+        return list
+    }
+
+
+    open fun findAccessibilityNodeInfosByText(root: AccessibilityNodeInfoCompat, text: String): List<AccessibilityNodeInfoCompat> {
+        val list = root.findAccessibilityNodeInfosByText(text)
+        addAll(list)
+        return list
+    }
+
+    @RequiresApi(Build.VERSION_CODES.JELLY_BEAN_MR2)
+    open fun findAccessibilityNodeInfosByViewId(root: AccessibilityNodeInfo, id: String): List<AccessibilityNodeInfo> {
+        val list = root.findAccessibilityNodeInfosByViewId(id)
+        addAll(list)
+        return list
+    }
+
+
+    open fun findAccessibilityNodeInfosByViewId(root: AccessibilityNodeInfoCompat, id: String): List<AccessibilityNodeInfoCompat> {
+        val list = root.findAccessibilityNodeInfosByViewId(id)
+        addAll(list)
+        return list
+    }
+
+    open fun recycle(nodeInfo: AccessibilityNodeInfo) {
+        nodeInfo.recycle()
+        mAccessibilityNodeInfoList.remove(nodeInfo)
+    }
+
+    open fun recycle(nodeInfo: AccessibilityNodeInfoCompat) {
+        recycle(nodeInfo.info as AccessibilityNodeInfo)
+    }
+
+    open fun recycleAll(): Int {
+        var notRecycledCount = 0
+        val size = mAccessibilityNodeInfoList.size
+        for ((key, value) in mAccessibilityNodeInfoList) {
+            try {
+                key.recycle()
+                notRecycledCount++
+                if (DEBUG)
+                    Log.w(TAG, value)
+            } catch (ignored: IllegalStateException) {
+            }
+
+        }
+        Log.v(TAG, "Total: $size Not recycled: $notRecycledCount")
+        return notRecycledCount
+    }
+
+    fun add(nodeInfo: AccessibilityNodeInfo?): AccessibilityNodeInfo? {
+        val stackTrace = if (DEBUG) Arrays.toString(Thread.currentThread().stackTrace) else null
+        if (nodeInfo != null)
+            mAccessibilityNodeInfoList[nodeInfo] = stackTrace
+        return nodeInfo
+    }
+
+    private fun addAll(nodeInfos: Collection<*>) {
+        val stackTrace = if (DEBUG) Arrays.toString(Thread.currentThread().stackTrace) else null
+        for (nodeInfo in nodeInfos) {
+            if (nodeInfo is AccessibilityNodeInfo) {
+                mAccessibilityNodeInfoList[nodeInfo] = stackTrace
+            } else if (nodeInfo is AccessibilityNodeInfoCompat) {
+                mAccessibilityNodeInfoList[nodeInfo.info as AccessibilityNodeInfo] = stackTrace
+            }
+        }
+    }
+
+    private class NoOpAllocator : AccessibilityNodeInfoAllocator() {
+
+        override fun getParent(n: AccessibilityNodeInfoCompat): AccessibilityNodeInfoCompat {
+            return n.parent
+        }
+
+        override fun getParent(n: AccessibilityNodeInfo): AccessibilityNodeInfo? {
+            return n.parent
+        }
+
+        override fun getChild(parent: AccessibilityNodeInfoCompat, i: Int): AccessibilityNodeInfoCompat {
+            return parent.getChild(i)
+        }
+
+        override fun getChild(parent: AccessibilityNodeInfo, i: Int): AccessibilityNodeInfo? {
+            return parent.getChild(i)
+        }
+
+        override fun findAccessibilityNodeInfosByViewId(root: AccessibilityNodeInfoCompat, id: String): List<AccessibilityNodeInfoCompat> {
+            return root.findAccessibilityNodeInfosByViewId(id)
+        }
+
+
+        @RequiresApi(Build.VERSION_CODES.JELLY_BEAN_MR2)
+        override fun findAccessibilityNodeInfosByViewId(root: AccessibilityNodeInfo, id: String): List<AccessibilityNodeInfo> {
+            return root.findAccessibilityNodeInfosByViewId(id)
+        }
+
+        override fun findAccessibilityNodeInfosByText(root: AccessibilityNodeInfo, text: String): List<AccessibilityNodeInfo> {
+            return root.findAccessibilityNodeInfosByText(text)
+        }
+
+        override fun findAccessibilityNodeInfosByText(root: AccessibilityNodeInfoCompat, text: String): List<AccessibilityNodeInfoCompat> {
+            return root.findAccessibilityNodeInfosByText(text)
+        }
+
+        override fun recycle(nodeInfo: AccessibilityNodeInfo) {
+            super.recycle(nodeInfo)
+        }
+
+        override fun recycle(nodeInfo: AccessibilityNodeInfoCompat) {
+            super.recycle(nodeInfo)
+        }
+
+        override fun recycleAll(): Int {
+            return -1
+        }
+
+
+    }
+
+    companion object {
+
+        val NONE: AccessibilityNodeInfoAllocator = NoOpAllocator()
+
+        private val TAG = "AccessibilityAllocator"
+        private val DEBUG = BuildConfig.DEBUG
+
+
+        val global = AccessibilityNodeInfoAllocator()
+
+        fun recycleList(root: AccessibilityNodeInfo, list: List<AccessibilityNodeInfo>) {
+            for (nodeInfo in list) {
+                if (nodeInfo !== root && nodeInfo != null) {
+                    //// FIXME: 2017/5/1 Issue #180
+                    nodeInfo.recycle()
+                }
+            }
+        }
+    }
+
+
+}
diff --git a/automator/src/main/java/com/stardust/view/accessibility/AccessibilityNodeInfoHelper.java b/automator/src/main/java/com/stardust/view/accessibility/AccessibilityNodeInfoHelper.java
deleted file mode 100644
index e84d2e71..00000000
--- a/automator/src/main/java/com/stardust/view/accessibility/AccessibilityNodeInfoHelper.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package com.stardust.view.accessibility;
-
-import android.graphics.Rect;
-import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat;
-import android.view.accessibility.AccessibilityNodeInfo;
-
-import com.stardust.automator.UiObject;
-
-/**
- * Created by Stardust on 2017/3/6.
- */
-
-public class AccessibilityNodeInfoHelper {
-
-    /**
-     * Returns the node's bounds clipped to the size of the display
-     *
-     * @param node
-     * @param width  pixel width of the display
-     * @param height pixel height of the display
-     * @return null if node is null, else a Rect containing visible bounds
-     */
-    public static Rect getVisibleBoundsInScreen(AccessibilityNodeInfo node, int width, int height) {
-        if (node == null) {
-            return null;
-        }
-        // targeted node's bounds
-        Rect nodeRect = new Rect();
-        node.getBoundsInScreen(nodeRect);
-
-        Rect displayRect = new Rect();
-        displayRect.top = 0;
-        displayRect.left = 0;
-        displayRect.right = width;
-        displayRect.bottom = height;
-        boolean intersect = nodeRect.intersect(displayRect);
-        return nodeRect;
-    }
-
-    public static Rect getBoundsInParent(AccessibilityNodeInfo nodeInfo) {
-        Rect rect = new Rect();
-        nodeInfo.getBoundsInParent(rect);
-        return rect;
-    }
-
-    public static Rect getBoundsInScreen(AccessibilityNodeInfo nodeInfo) {
-        Rect rect = new Rect();
-        nodeInfo.getBoundsInScreen(rect);
-        return rect;
-    }
-
-    public static Rect getBoundsInScreen(AccessibilityNodeInfoCompat nodeInfo) {
-        Rect rect = new Rect();
-        nodeInfo.getBoundsInScreen(rect);
-        return rect;
-    }
-
-    public static Rect getBoundsInParent(AccessibilityNodeInfoCompat nodeInfo) {
-        Rect rect = new Rect();
-        nodeInfo.getBoundsInParent(rect);
-        return rect;
-    }
-}
diff --git a/automator/src/main/java/com/stardust/view/accessibility/AccessibilityNodeInfoHelper.kt b/automator/src/main/java/com/stardust/view/accessibility/AccessibilityNodeInfoHelper.kt
new file mode 100644
index 00000000..f1a05900
--- /dev/null
+++ b/automator/src/main/java/com/stardust/view/accessibility/AccessibilityNodeInfoHelper.kt
@@ -0,0 +1,63 @@
+package com.stardust.view.accessibility
+
+import android.graphics.Rect
+import androidx.core.view.accessibility.AccessibilityNodeInfoCompat
+import android.view.accessibility.AccessibilityNodeInfo
+
+import com.stardust.automator.UiObject
+
+/**
+ * Created by Stardust on 2017/3/6.
+ */
+
+object AccessibilityNodeInfoHelper {
+
+    /**
+     * Returns the node's bounds clipped to the size of the display
+     *
+     * @param node
+     * @param width  pixel width of the display
+     * @param height pixel height of the display
+     * @return null if node is null, else a Rect containing visible bounds
+     */
+    fun getVisibleBoundsInScreen(node: AccessibilityNodeInfo?, width: Int, height: Int): Rect? {
+        if (node == null) {
+            return null
+        }
+        // targeted node's bounds
+        val nodeRect = Rect()
+        node.getBoundsInScreen(nodeRect)
+
+        val displayRect = Rect()
+        displayRect.top = 0
+        displayRect.left = 0
+        displayRect.right = width
+        displayRect.bottom = height
+        val intersect = nodeRect.intersect(displayRect)
+        return nodeRect
+    }
+
+    fun getBoundsInParent(nodeInfo: AccessibilityNodeInfo): Rect {
+        val rect = Rect()
+        nodeInfo.getBoundsInParent(rect)
+        return rect
+    }
+
+    fun getBoundsInScreen(nodeInfo: AccessibilityNodeInfo): Rect {
+        val rect = Rect()
+        nodeInfo.getBoundsInScreen(rect)
+        return rect
+    }
+
+    fun getBoundsInScreen(nodeInfo: AccessibilityNodeInfoCompat): Rect {
+        val rect = Rect()
+        nodeInfo.getBoundsInScreen(rect)
+        return rect
+    }
+
+    fun getBoundsInParent(nodeInfo: AccessibilityNodeInfoCompat): Rect {
+        val rect = Rect()
+        nodeInfo.getBoundsInParent(rect)
+        return rect
+    }
+}
diff --git a/automator/src/main/java/com/stardust/view/accessibility/AccessibilityNotificationObserver.java b/automator/src/main/java/com/stardust/view/accessibility/AccessibilityNotificationObserver.java
deleted file mode 100644
index e17478a7..00000000
--- a/automator/src/main/java/com/stardust/view/accessibility/AccessibilityNotificationObserver.java
+++ /dev/null
@@ -1,146 +0,0 @@
-package com.stardust.view.accessibility;
-
-import android.accessibilityservice.*;
-import android.content.Context;
-import android.support.annotation.Nullable;
-import android.util.Log;
-import android.view.accessibility.AccessibilityEvent;
-
-import com.stardust.notification.Notification;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Set;
-import java.util.concurrent.CopyOnWriteArrayList;
-
-/**
- * Created by Stardust on 2017/11/3.
- */
-
-public class AccessibilityNotificationObserver implements NotificationListener, AccessibilityDelegate {
-
-    public class Toast {
-        public final List<String> texts;
-        public final String packageName;
-
-        public Toast(String packageName, List<CharSequence> texts) {
-            this.texts = new ArrayList<>(texts.size());
-            for (CharSequence t : texts) {
-                if (t != null) {
-                    this.texts.add(t.toString());
-                }
-            }
-            this.packageName = packageName;
-        }
-
-        public String getText() {
-            if (texts.isEmpty()) {
-                return null;
-            }
-            CharSequence text = texts.get(0);
-            if (text == null) {
-                return null;
-            }
-            return text.toString();
-        }
-
-        public List<String> getTexts() {
-            return texts;
-        }
-
-        public String getPackageName() {
-            return packageName;
-        }
-
-        @Override
-        public String toString() {
-            return "Toast{" +
-                    "texts=" + texts +
-                    ", packageName='" + packageName + '\'' +
-                    '}';
-        }
-    }
-
-    public interface ToastListener {
-        void onToast(Toast toast);
-    }
-
-    private static final Set<Integer> EVENT_TYPES = Collections.singleton(AccessibilityEvent.TYPE_NOTIFICATION_STATE_CHANGED);
-
-    private static final String TAG = "NotificationObserver";
-    private static final String[] EMPTY = new String[0];
-
-    private Context mContext;
-    private CopyOnWriteArrayList<NotificationListener> mNotificationListeners = new CopyOnWriteArrayList<>();
-    private CopyOnWriteArrayList<ToastListener> mToastListeners = new CopyOnWriteArrayList<>();
-
-    public AccessibilityNotificationObserver(Context context) {
-        mContext = context;
-    }
-
-
-    public void addNotificationListener(NotificationListener listener) {
-        mNotificationListeners.add(listener);
-    }
-
-    public boolean removeNotificationListener(NotificationListener listener) {
-        return mNotificationListeners.remove(listener);
-    }
-
-
-    public void addToastListener(ToastListener listener) {
-        mToastListeners.add(listener);
-    }
-
-    public boolean removeToastListener(ToastListener listener) {
-        return mToastListeners.remove(listener);
-    }
-
-    @Override
-    public boolean onAccessibilityEvent(android.accessibilityservice.AccessibilityService service, AccessibilityEvent event) {
-        if (event.getParcelableData() instanceof Notification) {
-            android.app.Notification notification = (android.app.Notification) event.getParcelableData();
-            Log.d(TAG, "onNotification: " + notification + "; " + event);
-            onNotification(Notification.create(notification, event.getPackageName().toString()));
-        } else {
-            List<CharSequence> list = event.getText();
-            Log.d(TAG, "onNotification: " + list + "; " + event);
-            if (event.getPackageName().equals(mContext.getPackageName())) {
-                return false;
-            }
-            if (list != null) {
-                onToast(event, new Toast(event.getPackageName().toString(), list));
-            }
-        }
-
-        return false;
-    }
-
-    private void onToast(AccessibilityEvent event, Toast toast) {
-        for (ToastListener listener : mToastListeners) {
-            try {
-                listener.onToast(toast);
-            } catch (Exception e) {
-                Log.e(TAG, "Error onNotification: " + toast + " Listener: " + listener, e);
-            }
-        }
-    }
-
-    @Nullable
-    @Override
-    public Set<Integer> getEventTypes() {
-        return EVENT_TYPES;
-    }
-
-    @Override
-    public void onNotification(Notification notification) {
-        for (NotificationListener listener : mNotificationListeners) {
-            try {
-                listener.onNotification(notification);
-            } catch (Exception e) {
-                Log.e(TAG, "Error onNotification: " + notification + " Listener: " + listener, e);
-            }
-        }
-    }
-}
diff --git a/automator/src/main/java/com/stardust/view/accessibility/AccessibilityNotificationObserver.kt b/automator/src/main/java/com/stardust/view/accessibility/AccessibilityNotificationObserver.kt
new file mode 100644
index 00000000..820cdf52
--- /dev/null
+++ b/automator/src/main/java/com/stardust/view/accessibility/AccessibilityNotificationObserver.kt
@@ -0,0 +1,120 @@
+package com.stardust.view.accessibility
+
+import android.accessibilityservice.*
+import android.content.Context
+import android.util.Log
+import android.view.accessibility.AccessibilityEvent
+
+import com.stardust.notification.Notification
+
+import java.util.ArrayList
+import java.util.Collections
+import java.util.concurrent.CopyOnWriteArrayList
+
+/**
+ * Created by Stardust on 2017/11/3.
+ */
+
+class AccessibilityNotificationObserver(private val mContext: Context) : NotificationListener, AccessibilityDelegate {
+    private val mNotificationListeners = CopyOnWriteArrayList<NotificationListener>()
+    private val mToastListeners = CopyOnWriteArrayList<ToastListener>()
+
+    override val eventTypes: Set<Int>?
+        get() = EVENT_TYPES
+
+    inner class Toast(val packageName: String, texts: List<CharSequence>) {
+        val texts: MutableList<String>
+
+        val text: String?
+            get() {
+                return if (texts.isEmpty()) {
+                    null
+                } else texts[0]
+            }
+
+        init {
+            this.texts = ArrayList(texts.size)
+            for (t in texts) {
+                this.texts.add(t.toString())
+            }
+        }
+
+        override fun toString(): String {
+            return "Toast{" +
+                    "texts=" + texts +
+                    ", packageName='" + packageName + '\''.toString() +
+                    '}'.toString()
+        }
+    }
+
+    interface ToastListener {
+        fun onToast(toast: Toast)
+    }
+
+
+    fun addNotificationListener(listener: NotificationListener) {
+        mNotificationListeners.add(listener)
+    }
+
+    fun removeNotificationListener(listener: NotificationListener): Boolean {
+        return mNotificationListeners.remove(listener)
+    }
+
+
+    fun addToastListener(listener: ToastListener) {
+        mToastListeners.add(listener)
+    }
+
+    fun removeToastListener(listener: ToastListener): Boolean {
+        return mToastListeners.remove(listener)
+    }
+
+    override fun onAccessibilityEvent(service: android.accessibilityservice.AccessibilityService, event: AccessibilityEvent): Boolean {
+        if (event.parcelableData is Notification) {
+            val notification = event.parcelableData as android.app.Notification
+            Log.d(TAG, "onNotification: $notification; $event")
+            onNotification(Notification.create(notification, event.packageName.toString()))
+        } else {
+            val list = event.text
+            Log.d(TAG, "onNotification: $list; $event")
+            if (event.packageName == mContext.packageName) {
+                return false
+            }
+            if (list != null) {
+                onToast(event, Toast(event.packageName.toString(), list))
+            }
+        }
+
+        return false
+    }
+
+    private fun onToast(event: AccessibilityEvent, toast: Toast) {
+        for (listener in mToastListeners) {
+            try {
+                listener.onToast(toast)
+            } catch (e: Exception) {
+                Log.e(TAG, "Error onNotification: $toast Listener: $listener", e)
+            }
+
+        }
+    }
+
+    override fun onNotification(notification: Notification) {
+        for (listener in mNotificationListeners) {
+            try {
+                listener.onNotification(notification)
+            } catch (e: Exception) {
+                Log.e(TAG, "Error onNotification: $notification Listener: $listener", e)
+            }
+
+        }
+    }
+
+    companion object {
+
+        private val EVENT_TYPES = setOf(AccessibilityEvent.TYPE_NOTIFICATION_STATE_CHANGED)
+
+        private val TAG = "NotificationObserver"
+        private val EMPTY = arrayOfNulls<String>(0)
+    }
+}
diff --git a/automator/src/main/java/com/stardust/view/accessibility/AccessibilityService.java b/automator/src/main/java/com/stardust/view/accessibility/AccessibilityService.java
deleted file mode 100644
index 5a993948..00000000
--- a/automator/src/main/java/com/stardust/view/accessibility/AccessibilityService.java
+++ /dev/null
@@ -1,175 +0,0 @@
-package com.stardust.view.accessibility;
-
-import android.os.Build;
-import android.support.annotation.Nullable;
-import android.util.Log;
-import android.view.KeyEvent;
-import android.view.accessibility.AccessibilityEvent;
-import android.view.accessibility.AccessibilityNodeInfo;
-
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-import java.util.SortedMap;
-import java.util.TreeMap;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.locks.Condition;
-import java.util.concurrent.locks.ReentrantLock;
-
-/**
- * Created by Stardust on 2017/5/2.
- */
-
-public class AccessibilityService extends android.accessibilityservice.AccessibilityService {
-
-    private static final String TAG = "AccessibilityService";
-
-    private static final SortedMap<Integer, AccessibilityDelegate> mDelegates = new TreeMap<>();
-    private static final ReentrantLock LOCK = new ReentrantLock();
-    private static final Condition ENABLED = LOCK.newCondition();
-    private static AccessibilityService instance;
-    private static final OnKeyListener.Observer stickOnKeyObserver = new OnKeyListener.Observer();
-    private static boolean containsAllEventTypes = false;
-    private static final Set<Integer> eventTypes = new HashSet<>();
-    private OnKeyListener.Observer mOnKeyObserver = new OnKeyListener.Observer();
-    private KeyInterceptor.Observer mKeyInterrupterObserver = new KeyInterceptor.Observer();
-    private ExecutorService mKeyEventExecutor;
-    private AccessibilityNodeInfo mFastRootInActiveWindow;
-
-    public static void addDelegate(int uniquePriority, AccessibilityDelegate delegate) {
-        mDelegates.put(uniquePriority, delegate);
-        Set<Integer> set = delegate.getEventTypes();
-        if (set == null)
-            containsAllEventTypes = true;
-        else
-            eventTypes.addAll(set);
-    }
-
-    public static AccessibilityService getInstance() {
-        return instance;
-    }
-
-    @Override
-    public void onAccessibilityEvent(final AccessibilityEvent event) {
-        instance = this;
-        //Log.v(TAG, "onAccessibilityEvent: " + event);
-        if (!containsAllEventTypes && !eventTypes.contains(event.getEventType()))
-            return;
-        int type = event.getEventType();
-        if (type == AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED ||
-                type == AccessibilityEvent.TYPE_VIEW_FOCUSED) {
-            AccessibilityNodeInfo root = getRootInActiveWindow();
-            if (root != null) {
-                mFastRootInActiveWindow = root;
-            }
-        }
-
-        for (Map.Entry<Integer, AccessibilityDelegate> entry : mDelegates.entrySet()) {
-            AccessibilityDelegate delegate = entry.getValue();
-            Set<Integer> types = delegate.getEventTypes();
-            if (types != null && !delegate.getEventTypes().contains(event.getEventType()))
-                continue;
-            //long start = System.currentTimeMillis();
-            if (delegate.onAccessibilityEvent(AccessibilityService.this, event))
-                break;
-            //Log.v(TAG, "millis: " + (System.currentTimeMillis() - start) + " delegate: " + entry.getValue().getClass().getName());
-        }
-    }
-
-
-    @Override
-    public void onInterrupt() {
-
-    }
-
-    @Override
-    protected boolean onKeyEvent(final KeyEvent event) {
-        if (mKeyEventExecutor == null) {
-            mKeyEventExecutor = Executors.newSingleThreadExecutor();
-        }
-        mKeyEventExecutor.execute(() -> {
-            stickOnKeyObserver.onKeyEvent(event.getKeyCode(), event);
-            mOnKeyObserver.onKeyEvent(event.getKeyCode(), event);
-        });
-        return mKeyInterrupterObserver.onInterceptKeyEvent(event);
-    }
-
-    public KeyInterceptor.Observer getKeyInterrupterObserver() {
-        return mKeyInterrupterObserver;
-    }
-
-    public OnKeyListener.Observer getOnKeyObserver() {
-        return mOnKeyObserver;
-    }
-
-    @Override
-    public AccessibilityNodeInfo getRootInActiveWindow() {
-        try {
-            return super.getRootInActiveWindow();
-        } catch (Exception e) {
-            return null;
-        }
-    }
-
-    @Override
-    public void onDestroy() {
-        instance = null;
-        if (mKeyEventExecutor != null)
-            mKeyEventExecutor.shutdownNow();
-        super.onDestroy();
-    }
-
-
-    @Override
-    protected void onServiceConnected() {
-        Log.v(TAG, "onServiceConnected: " + getServiceInfo().toString());
-        instance = this;
-        super.onServiceConnected();
-        LOCK.lock();
-        ENABLED.signalAll();
-        LOCK.unlock();
-        // FIXME: 2017/2/12 有时在无障碍中开启服务后这里不会调用服务也不会运行，安卓的BUG???
-    }
-
-
-    @Nullable
-    public AccessibilityNodeInfo fastRootInActiveWindow() {
-        return mFastRootInActiveWindow;
-    }
-
-    public static boolean disable() {
-        if (instance != null && Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-            instance.disableSelf();
-            return true;
-        }
-        return false;
-    }
-
-    public static boolean waitForEnabled(long timeOut) {
-        if (instance != null)
-            return true;
-        LOCK.lock();
-        try {
-            if (instance != null)
-                return true;
-            if (timeOut == -1) {
-                ENABLED.await();
-                return true;
-            }
-            return ENABLED.await(timeOut, TimeUnit.MILLISECONDS);
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-            return false;
-        } finally {
-            LOCK.unlock();
-        }
-    }
-
-    public static OnKeyListener.Observer getStickOnKeyObserver() {
-        return stickOnKeyObserver;
-    }
-
-
-}
diff --git a/automator/src/main/java/com/stardust/view/accessibility/AccessibilityService.kt b/automator/src/main/java/com/stardust/view/accessibility/AccessibilityService.kt
new file mode 100644
index 00000000..934ab093
--- /dev/null
+++ b/automator/src/main/java/com/stardust/view/accessibility/AccessibilityService.kt
@@ -0,0 +1,172 @@
+package com.stardust.view.accessibility
+
+import android.os.Build
+import android.util.Log
+import android.view.KeyEvent
+import android.view.accessibility.AccessibilityEvent
+import android.view.accessibility.AccessibilityNodeInfo
+import com.stardust.event.EventDispatcher
+
+import java.util.HashSet
+import java.util.TreeMap
+import java.util.concurrent.ExecutorService
+import java.util.concurrent.Executors
+import java.util.concurrent.TimeUnit
+import java.util.concurrent.locks.ReentrantLock
+
+/**
+ * Created by Stardust on 2017/5/2.
+ */
+
+
+open class AccessibilityService : android.accessibilityservice.AccessibilityService() {
+
+    interface GestureListener {
+        fun onGesture(gestureId: Int)
+    }
+
+    val onKeyObserver = OnKeyListener.Observer()
+    val keyInterrupterObserver = KeyInterceptor.Observer()
+    val gestureEventDispatcher = EventDispatcher<GestureListener>()
+    private var mEventExecutor: ExecutorService? = null
+    private var mFastRootInActiveWindow: AccessibilityNodeInfo? = null
+    private val eventExecutor: ExecutorService
+        get() {
+            return mEventExecutor ?: {
+                val executor = Executors.newSingleThreadExecutor()
+                mEventExecutor = executor
+                executor
+            }()
+        }
+
+    override fun onAccessibilityEvent(event: AccessibilityEvent) {
+        instance = this
+        //Log.v(TAG, "onAccessibilityEvent: " + event);
+        if (!containsAllEventTypes && !eventTypes.contains(event.eventType))
+            return
+        val type = event.eventType
+        if (type == AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED || type == AccessibilityEvent.TYPE_VIEW_FOCUSED) {
+            val root = rootInActiveWindow
+            if (root != null) {
+                mFastRootInActiveWindow = root
+            }
+        }
+
+        for ((_, delegate) in mDelegates) {
+            val types = delegate.eventTypes
+            if (types != null && !delegate.eventTypes!!.contains(event.eventType))
+                continue
+            //long start = System.currentTimeMillis();
+            if (delegate.onAccessibilityEvent(this@AccessibilityService, event))
+                break
+            //Log.v(TAG, "millis: " + (System.currentTimeMillis() - start) + " delegate: " + entry.getValue().getClass().getName());
+        }
+    }
+
+
+    override fun onInterrupt() {
+
+    }
+
+    override fun onKeyEvent(event: KeyEvent): Boolean {
+        eventExecutor.execute {
+            stickOnKeyObserver.onKeyEvent(event.keyCode, event)
+            onKeyObserver.onKeyEvent(event.keyCode, event)
+        }
+        return keyInterrupterObserver.onInterceptKeyEvent(event)
+    }
+
+    override fun onGesture(gestureId: Int): Boolean {
+        eventExecutor.execute {
+            gestureEventDispatcher.dispatchEvent {
+                onGesture(gestureId)
+            }
+        }
+        return false
+    }
+
+    override fun getRootInActiveWindow(): AccessibilityNodeInfo? {
+        return try {
+            super.getRootInActiveWindow()
+        } catch (e: Exception) {
+            null
+        }
+
+    }
+
+    override fun onDestroy() {
+        Log.v(TAG, "onDestroy: $instance")
+        instance = null
+        mEventExecutor?.shutdownNow()
+        super.onDestroy()
+    }
+
+
+    override fun onServiceConnected() {
+        Log.v(TAG, "onServiceConnected: " + serviceInfo.toString())
+        instance = this
+        super.onServiceConnected()
+        LOCK.lock()
+        ENABLED.signalAll()
+        LOCK.unlock()
+        // FIXME: 2017/2/12 有时在无障碍中开启服务后这里不会调用服务也不会运行，安卓的BUG???
+    }
+
+
+    fun fastRootInActiveWindow(): AccessibilityNodeInfo? {
+        return mFastRootInActiveWindow
+    }
+
+    companion object {
+
+        private val TAG = "AccessibilityService"
+
+        private val mDelegates = TreeMap<Int, AccessibilityDelegate>()
+        private val LOCK = ReentrantLock()
+        private val ENABLED = LOCK.newCondition()
+        var instance: AccessibilityService? = null
+            private set
+        val stickOnKeyObserver = OnKeyListener.Observer()
+        private var containsAllEventTypes = false
+        private val eventTypes = HashSet<Int>()
+
+        fun addDelegate(uniquePriority: Int, delegate: AccessibilityDelegate) {
+            mDelegates[uniquePriority] = delegate
+            val set = delegate.eventTypes
+            if (set == null)
+                containsAllEventTypes = true
+            else
+                eventTypes.addAll(set)
+        }
+
+        fun disable(): Boolean {
+            if (instance != null && Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+                instance!!.disableSelf()
+                return true
+            }
+            return false
+        }
+
+        fun waitForEnabled(timeOut: Long): Boolean {
+            if (instance != null)
+                return true
+            LOCK.lock()
+            try {
+                if (instance != null)
+                    return true
+                if (timeOut == -1L) {
+                    ENABLED.await()
+                    return true
+                }
+                return ENABLED.await(timeOut, TimeUnit.MILLISECONDS)
+            } catch (e: InterruptedException) {
+                e.printStackTrace()
+                return false
+            } finally {
+                LOCK.unlock()
+            }
+        }
+    }
+
+
+}
diff --git a/automator/src/main/java/com/stardust/view/accessibility/AccessibilityServiceUtils.java b/automator/src/main/java/com/stardust/view/accessibility/AccessibilityServiceUtils.java
deleted file mode 100644
index 35355bb0..00000000
--- a/automator/src/main/java/com/stardust/view/accessibility/AccessibilityServiceUtils.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package com.stardust.view.accessibility;
-
-import android.accessibilityservice.AccessibilityService;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.provider.Settings;
-import android.text.TextUtils;
-
-import java.util.Locale;
-
-
-/**
- * Created by Stardust on 2017/1/26.
- */
-
-public class AccessibilityServiceUtils {
-
-    public static void goToAccessibilitySetting(Context context) {
-        context.startActivity(new Intent(Settings.ACTION_ACCESSIBILITY_SETTINGS).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
-    }
-
-    public static boolean isAccessibilityServiceEnabled(Context context, Class<? extends AccessibilityService> accessibilityService) {
-        ComponentName expectedComponentName = new ComponentName(context, accessibilityService);
-
-        String enabledServicesSetting = Settings.Secure.getString(context.getContentResolver(), Settings.Secure.ENABLED_ACCESSIBILITY_SERVICES);
-        if (enabledServicesSetting == null)
-            return false;
-
-        TextUtils.SimpleStringSplitter colonSplitter = new TextUtils.SimpleStringSplitter(':');
-        colonSplitter.setString(enabledServicesSetting);
-
-        while (colonSplitter.hasNext()) {
-            String componentNameString = colonSplitter.next();
-            ComponentName enabledService = ComponentName.unflattenFromString(componentNameString);
-
-            if (enabledService != null && enabledService.equals(expectedComponentName))
-                return true;
-        }
-
-        return false;
-    }
-
-
-}
diff --git a/automator/src/main/java/com/stardust/view/accessibility/AccessibilityServiceUtils.kt b/automator/src/main/java/com/stardust/view/accessibility/AccessibilityServiceUtils.kt
new file mode 100644
index 00000000..aa3685b6
--- /dev/null
+++ b/automator/src/main/java/com/stardust/view/accessibility/AccessibilityServiceUtils.kt
@@ -0,0 +1,44 @@
+package com.stardust.view.accessibility
+
+import android.accessibilityservice.AccessibilityService
+import android.content.ComponentName
+import android.content.Context
+import android.content.Intent
+import android.provider.Settings
+import android.text.TextUtils
+
+import java.util.Locale
+
+
+/**
+ * Created by Stardust on 2017/1/26.
+ */
+
+object AccessibilityServiceUtils {
+
+    fun goToAccessibilitySetting(context: Context) {
+        context.startActivity(Intent(Settings.ACTION_ACCESSIBILITY_SETTINGS).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK))
+    }
+
+    fun isAccessibilityServiceEnabled(context: Context, accessibilityService: Class<out AccessibilityService>): Boolean {
+        val expectedComponentName = ComponentName(context, accessibilityService)
+
+        val enabledServicesSetting = Settings.Secure.getString(context.contentResolver, Settings.Secure.ENABLED_ACCESSIBILITY_SERVICES)
+                ?: return false
+
+        val colonSplitter = TextUtils.SimpleStringSplitter(':')
+        colonSplitter.setString(enabledServicesSetting)
+
+        while (colonSplitter.hasNext()) {
+            val componentNameString = colonSplitter.next()
+            val enabledService = ComponentName.unflattenFromString(componentNameString)
+
+            if (enabledService != null && enabledService == expectedComponentName)
+                return true
+        }
+
+        return false
+    }
+
+
+}
diff --git a/automator/src/main/java/com/stardust/view/accessibility/KeyInterceptor.java b/automator/src/main/java/com/stardust/view/accessibility/KeyInterceptor.java
deleted file mode 100644
index 4bee0852..00000000
--- a/automator/src/main/java/com/stardust/view/accessibility/KeyInterceptor.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.stardust.view.accessibility;
-
-import android.view.KeyEvent;
-
-import java.util.concurrent.CopyOnWriteArrayList;
-
-/**
- * Created by Stardust on 2018/2/27.
- */
-
-public interface KeyInterceptor {
-
-    boolean onInterceptKeyEvent(KeyEvent event);
-
-    class Observer implements KeyInterceptor {
-        private CopyOnWriteArrayList<KeyInterceptor> mKeyInterceptors = new CopyOnWriteArrayList<>();
-
-        public void addKeyInterrupter(KeyInterceptor interrupter){
-            mKeyInterceptors.add(interrupter);
-        }
-
-        public boolean removeKeyInterrupter(KeyInterceptor interrupter){
-            return mKeyInterceptors.remove(interrupter);
-        }
-
-
-        @Override
-        public boolean onInterceptKeyEvent(KeyEvent event) {
-            for(KeyInterceptor interrupter : mKeyInterceptors){
-                try {
-                    if(interrupter.onInterceptKeyEvent(event)){
-                        return true;
-                    }
-                }catch (Exception e){
-                    e.printStackTrace();
-                }
-            }
-            return false;
-        }
-    }
-}
diff --git a/automator/src/main/java/com/stardust/view/accessibility/KeyInterceptor.kt b/automator/src/main/java/com/stardust/view/accessibility/KeyInterceptor.kt
new file mode 100644
index 00000000..235d370c
--- /dev/null
+++ b/automator/src/main/java/com/stardust/view/accessibility/KeyInterceptor.kt
@@ -0,0 +1,41 @@
+package com.stardust.view.accessibility
+
+import android.view.KeyEvent
+
+import java.util.concurrent.CopyOnWriteArrayList
+
+/**
+ * Created by Stardust on 2018/2/27.
+ */
+
+interface KeyInterceptor {
+
+    fun onInterceptKeyEvent(event: KeyEvent): Boolean
+
+    class Observer : KeyInterceptor {
+        private val mKeyInterceptors = CopyOnWriteArrayList<KeyInterceptor>()
+
+        fun addKeyInterrupter(interrupter: KeyInterceptor) {
+            mKeyInterceptors.add(interrupter)
+        }
+
+        fun removeKeyInterrupter(interrupter: KeyInterceptor): Boolean {
+            return mKeyInterceptors.remove(interrupter)
+        }
+
+
+        override fun onInterceptKeyEvent(event: KeyEvent): Boolean {
+            for (interrupter in mKeyInterceptors) {
+                try {
+                    if (interrupter.onInterceptKeyEvent(event)) {
+                        return true
+                    }
+                } catch (e: Exception) {
+                    e.printStackTrace()
+                }
+
+            }
+            return false
+        }
+    }
+}
diff --git a/automator/src/main/java/com/stardust/view/accessibility/LayoutInspectService.java b/automator/src/main/java/com/stardust/view/accessibility/LayoutInspectService.java
deleted file mode 100644
index 9d72b7e5..00000000
--- a/automator/src/main/java/com/stardust/view/accessibility/LayoutInspectService.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.stardust.view.accessibility;
-
-import android.accessibilityservice.AccessibilityServiceInfo;
-import android.view.accessibility.AccessibilityNodeInfo;
-
-/**
- * Created by Stardust on 2017/7/13.
- */
-
-public class LayoutInspectService extends AccessibilityService {
-
-    private static LayoutInspectService instance;
-
-    public static LayoutInspectService getInstance() {
-        return instance;
-    }
-
-
-    @Override
-    protected void onServiceConnected() {
-        AccessibilityServiceInfo info = getServiceInfo();
-        info.flags |= AccessibilityServiceInfo.FLAG_INCLUDE_NOT_IMPORTANT_VIEWS;
-        setServiceInfo(info);
-        super.onServiceConnected();
-    }
-}
-
diff --git a/automator/src/main/java/com/stardust/view/accessibility/LayoutInspectService.kt b/automator/src/main/java/com/stardust/view/accessibility/LayoutInspectService.kt
new file mode 100644
index 00000000..c44358f6
--- /dev/null
+++ b/automator/src/main/java/com/stardust/view/accessibility/LayoutInspectService.kt
@@ -0,0 +1,25 @@
+package com.stardust.view.accessibility
+
+import android.accessibilityservice.AccessibilityServiceInfo
+import android.view.accessibility.AccessibilityNodeInfo
+
+/**
+ * Created by Stardust on 2017/7/13.
+ */
+
+class LayoutInspectService : AccessibilityService() {
+
+
+    override fun onServiceConnected() {
+        val info = serviceInfo
+        info.flags = info.flags or AccessibilityServiceInfo.FLAG_INCLUDE_NOT_IMPORTANT_VIEWS
+        serviceInfo = info
+        super.onServiceConnected()
+    }
+
+    companion object {
+
+        val instance: LayoutInspectService? = null
+    }
+}
+
diff --git a/automator/src/main/java/com/stardust/view/accessibility/LayoutInspector.java b/automator/src/main/java/com/stardust/view/accessibility/LayoutInspector.java
deleted file mode 100644
index 1d7383c4..00000000
--- a/automator/src/main/java/com/stardust/view/accessibility/LayoutInspector.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package com.stardust.view.accessibility;
-
-import android.os.Build;
-import android.support.annotation.RequiresApi;
-import android.util.Log;
-import android.view.accessibility.AccessibilityNodeInfo;
-
-import java.util.concurrent.CopyOnWriteArrayList;
-import java.util.concurrent.Executor;
-import java.util.concurrent.Executors;
-
-/**
- * Created by Stardust on 2017/3/10.
- */
-
-public class LayoutInspector {
-
-    public interface CaptureAvailableListener {
-        void onCaptureAvailable(NodeInfo capture);
-    }
-
-    private static final String LOG_TAG = LayoutInspector.class.getSimpleName();
-    private volatile NodeInfo mCapture;
-    private volatile boolean mDumping = false;
-    private Executor mExecutor = Executors.newSingleThreadExecutor();
-    private CopyOnWriteArrayList<CaptureAvailableListener> mCaptureAvailableListeners = new CopyOnWriteArrayList<>();
-
-    public boolean captureCurrentWindow() {
-        AccessibilityService service = AccessibilityService.getInstance();
-        if (service == null) {
-            Log.d(LOG_TAG, "captureCurrentWindow: service = null");
-            mCapture = null;
-            return false;
-        }
-        final AccessibilityNodeInfo root = getRootInActiveWindow(service);
-        if (root == null) {
-            Log.d(LOG_TAG, "captureCurrentWindow: root = null");
-            mCapture = null;
-            return false;
-        }
-        mExecutor.execute(() -> {
-            mDumping = true;
-            mCapture = NodeInfo.capture(root);
-            mDumping = false;
-            for (CaptureAvailableListener l : mCaptureAvailableListeners) {
-                l.onCaptureAvailable(mCapture);
-            }
-        });
-        return true;
-    }
-
-    public void addCaptureAvailableListener(CaptureAvailableListener l){
-        mCaptureAvailableListeners.add(l);
-    }
-
-    public boolean removeCaptureAvailableListener(CaptureAvailableListener l){
-        return mCaptureAvailableListeners.remove(l);
-    }
-
-    private AccessibilityNodeInfo getRootInActiveWindow(AccessibilityService service) {
-        AccessibilityNodeInfo root = service.getRootInActiveWindow();
-        if (root == null)
-            return service.fastRootInActiveWindow();
-        return root;
-
-    }
-
-    @RequiresApi(api = Build.VERSION_CODES.JELLY_BEAN_MR2)
-    private void refreshChildList(AccessibilityNodeInfo root) {
-        if (root == null)
-            return;
-        root.refresh();
-        int childCount = root.getChildCount();
-        for (int i = 0; i < childCount; i++) {
-            refreshChildList(root.getChild(i));
-        }
-    }
-
-    public boolean isDumping() {
-        return mDumping;
-    }
-
-    public void clearCapture() {
-        mCapture = null;
-    }
-
-    public NodeInfo getCapture() {
-        return mCapture;
-    }
-}
diff --git a/automator/src/main/java/com/stardust/view/accessibility/LayoutInspector.kt b/automator/src/main/java/com/stardust/view/accessibility/LayoutInspector.kt
new file mode 100644
index 00000000..66a08dc8
--- /dev/null
+++ b/automator/src/main/java/com/stardust/view/accessibility/LayoutInspector.kt
@@ -0,0 +1,87 @@
+package com.stardust.view.accessibility
+
+import android.content.Context
+import android.os.Build
+import androidx.annotation.RequiresApi
+import android.util.Log
+import android.view.accessibility.AccessibilityNodeInfo
+
+import java.util.concurrent.CopyOnWriteArrayList
+import java.util.concurrent.Executor
+import java.util.concurrent.Executors
+
+/**
+ * Created by Stardust on 2017/3/10.
+ */
+
+class LayoutInspector(private val mContext: Context) {
+    @Volatile
+    var capture: NodeInfo? = null
+        private set
+    @Volatile
+    var isDumping = false
+        private set
+    private val mExecutor = Executors.newSingleThreadExecutor()
+    private val mCaptureAvailableListeners = CopyOnWriteArrayList<CaptureAvailableListener>()
+
+    interface CaptureAvailableListener {
+        fun onCaptureAvailable(capture: NodeInfo?)
+    }
+
+    fun captureCurrentWindow(): Boolean {
+        val service = AccessibilityService.instance
+        if (service == null) {
+            Log.d(LOG_TAG, "captureCurrentWindow: service = null")
+            capture = null
+            return false
+        }
+        val root = getRootInActiveWindow(service)
+        if (root == null) {
+            Log.d(LOG_TAG, "captureCurrentWindow: root = null")
+            capture = null
+            return false
+        }
+        mExecutor.execute {
+            isDumping = true
+            capture = NodeInfo.capture(mContext, root)
+            isDumping = false
+            for (l in mCaptureAvailableListeners) {
+                l.onCaptureAvailable(capture)
+            }
+        }
+        return true
+    }
+
+    fun addCaptureAvailableListener(l: CaptureAvailableListener) {
+        mCaptureAvailableListeners.add(l)
+    }
+
+    fun removeCaptureAvailableListener(l: CaptureAvailableListener): Boolean {
+        return mCaptureAvailableListeners.remove(l)
+    }
+
+    private fun getRootInActiveWindow(service: AccessibilityService): AccessibilityNodeInfo? {
+        return service.rootInActiveWindow ?: return service.fastRootInActiveWindow()
+
+    }
+
+    @RequiresApi(api = Build.VERSION_CODES.JELLY_BEAN_MR2)
+    private fun refreshChildList(root: AccessibilityNodeInfo?) {
+        if (root == null)
+            return
+        root.refresh()
+        val childCount = root.childCount
+        for (i in 0 until childCount) {
+            refreshChildList(root.getChild(i))
+        }
+    }
+
+    fun clearCapture() {
+        capture = null
+    }
+
+    companion object {
+
+        private val LOG_TAG = LayoutInspector::class.java.simpleName
+    }
+}
diff --git a/automator/src/main/java/com/stardust/view/accessibility/NodeInfo.java b/automator/src/main/java/com/stardust/view/accessibility/NodeInfo.java
deleted file mode 100644
index aaf8c1b9..00000000
--- a/automator/src/main/java/com/stardust/view/accessibility/NodeInfo.java
+++ /dev/null
@@ -1,177 +0,0 @@
-package com.stardust.view.accessibility;
-
-import android.graphics.Rect;
-import android.support.annotation.Keep;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat;
-import android.view.accessibility.AccessibilityNodeInfo;
-
-import com.stardust.automator.UiObject;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Created by Stardust on 2017/3/10.
- */
-@Keep
-public class NodeInfo {
-
-    private List<NodeInfo> children = new ArrayList<>();
-    private Rect mBoundsInScreen = new Rect();
-    private Rect mBoundsInParent = new Rect();
-
-    public String id;
-    public String desc;
-    public String className;
-    public String packageName;
-    public String text;
-    public int depth;
-    public int drawingOrder;
-    public boolean accessibilityFocused;
-    public boolean checked;
-    public boolean clickable;
-    public boolean contextClickable;
-    public boolean dismissable;
-    public boolean editable;
-    public boolean enabled;
-    public boolean focusable;
-    public boolean longClickable;
-    public int row;
-    public int column;
-    public int rowCount;
-    public int columnCount;
-    public int rowSpan;
-    public int columnSpan;
-    public boolean selected;
-    public boolean scrollable;
-    public String bounds;
-    public boolean checkable;
-    public boolean focused;
-    public boolean visibleToUser;
-    public int indexInParent;
-    public NodeInfo parent;
-
-
-
-    public NodeInfo(UiObject node, NodeInfo parent) {
-        id = simplifyId(node.getViewIdResourceName());
-        desc = node.desc();
-        className = node.className();
-        packageName = node.packageName();
-        text = node.text();
-
-        depth = node.depth();
-        drawingOrder = node.getDrawingOrder();
-
-        row = node.row();
-        column = node.column();
-        rowCount = node.rowCount();
-        columnCount = node.columnCount();
-        rowSpan = node.rowSpan();
-        columnSpan = node.columnSpan();
-
-        accessibilityFocused = node.isAccessibilityFocused();
-        checked = node.isChecked();
-        checkable = node.isCheckable();
-        clickable = node.isClickable();
-        contextClickable = node.isContextClickable();
-        dismissable = node.isDismissable();
-        enabled = node.isEnabled();
-        editable = node.isEditable();
-        focusable = node.isFocusable();
-        focused = node.focused();
-        longClickable = node.isLongClickable();
-        selected = node.isSelected();
-        scrollable = node.isScrollable();
-        visibleToUser = node.visibleToUser();
-        node.getBoundsInScreen(mBoundsInScreen);
-        node.getBoundsInParent(mBoundsInParent);
-        bounds = boundsToString(mBoundsInScreen);
-        indexInParent = node.indexInParent();
-
-        this.parent = parent;
-
-    }
-
-    private String simplifyId(String idResourceName) {
-        if (idResourceName == null)
-            return null;
-        int i = idResourceName.indexOf('/');
-        return idResourceName.substring(i + 1);
-    }
-
-    public Rect getBoundsInScreen() {
-        return mBoundsInScreen;
-    }
-
-
-    public Rect getBoundsInParent() {
-        return mBoundsInParent;
-    }
-
-    public static String boundsToString(Rect rect) {
-        return rect.toString().replace('-', ',').replace(" ", "").substring(4);
-    }
-
-
-    public static NodeInfo capture(@NonNull UiObject uiObject, @Nullable NodeInfo parent) {
-        NodeInfo nodeInfo = new NodeInfo(uiObject, parent);
-        int childCount = uiObject.getChildCount();
-        for (int i = 0; i < childCount; i++) {
-            UiObject child = uiObject.child(i);
-            if (child != null) {
-                nodeInfo.children.add(capture(child, nodeInfo));
-            }
-        }
-        return nodeInfo;
-    }
-
-    public static NodeInfo capture(@NonNull AccessibilityNodeInfo root) {
-        UiObject r = UiObject.createRoot(root);
-        return capture(r, null);
-    }
-
-    @NonNull
-    public List<NodeInfo> getChildren() {
-        return children;
-    }
-
-    @Override
-    public String toString() {
-        return className + "{" +
-                "childCount=" + children.size() +
-                ", mBoundsInScreen=" + mBoundsInScreen +
-                ", mBoundsInParent=" + mBoundsInParent +
-                ", id='" + id + '\'' +
-                ", desc='" + desc + '\'' +
-                ", packageName='" + packageName + '\'' +
-                ", text='" + text + '\'' +
-                ", depth=" + depth +
-                ", drawingOrder=" + drawingOrder +
-                ", accessibilityFocused=" + accessibilityFocused +
-                ", checked=" + checked +
-                ", clickable=" + clickable +
-                ", contextClickable=" + contextClickable +
-                ", dismissable=" + dismissable +
-                ", editable=" + editable +
-                ", enabled=" + enabled +
-                ", focusable=" + focusable +
-                ", longClickable=" + longClickable +
-                ", row=" + row +
-                ", column=" + column +
-                ", rowCount=" + rowCount +
-                ", columnCount=" + columnCount +
-                ", rowSpan=" + rowSpan +
-                ", columnSpan=" + columnSpan +
-                ", selected=" + selected +
-                ", scrollable=" + scrollable +
-                ", bounds='" + bounds + '\'' +
-                ", checkable=" + checkable +
-                ", focused=" + focused +
-                ", visibleToUser=" + visibleToUser +
-                ", parent=" + parent.className +
-                '}';
-    }
-}
diff --git a/automator/src/main/java/com/stardust/view/accessibility/NodeInfo.kt b/automator/src/main/java/com/stardust/view/accessibility/NodeInfo.kt
new file mode 100644
index 00000000..bdc16d7f
--- /dev/null
+++ b/automator/src/main/java/com/stardust/view/accessibility/NodeInfo.kt
@@ -0,0 +1,185 @@
+package com.stardust.view.accessibility
+
+import android.content.Context
+import android.content.pm.PackageManager
+import android.content.res.Resources
+import android.graphics.Rect
+import androidx.annotation.Keep
+import android.view.accessibility.AccessibilityNodeInfo
+
+import com.stardust.automator.UiObject
+
+import java.util.ArrayList
+import java.util.HashMap
+
+/**
+ * Created by Stardust on 2017/3/10.
+ */
+@Keep
+class NodeInfo(resources: Resources?, node: UiObject, var parent: NodeInfo?) {
+
+    private val children = ArrayList<NodeInfo>()
+    val boundsInScreen = Rect()
+    val boundsInParent = Rect()
+
+    var id: String? = null
+    var idHex: String? = null
+    var fullId: String? = null
+    var desc: String? = null
+    var className: String? = null
+    var packageName: String? = null
+    var text: String
+    var depth: Int = 0
+    var drawingOrder: Int = 0
+    var accessibilityFocused: Boolean = false
+    var checked: Boolean = false
+    var clickable: Boolean = false
+    var contextClickable: Boolean = false
+    var dismissable: Boolean = false
+    var editable: Boolean = false
+    var enabled: Boolean = false
+    var focusable: Boolean = false
+    var longClickable: Boolean = false
+    var row: Int = 0
+    var column: Int = 0
+    var rowCount: Int = 0
+    var columnCount: Int = 0
+    var rowSpan: Int = 0
+    var columnSpan: Int = 0
+    var selected: Boolean = false
+    var scrollable: Boolean = false
+    var bounds: String
+    var checkable: Boolean = false
+    var focused: Boolean = false
+    var visibleToUser: Boolean = false
+    var indexInParent: Int = 0
+
+
+    init {
+        fullId = node.viewIdResourceName
+        id = simplifyId(fullId)
+        desc = node.desc()
+        className = node.className()
+        packageName = node.packageName()
+        text = node.text()
+
+        depth = node.depth()
+        drawingOrder = node.drawingOrder
+
+        row = node.row()
+        column = node.column()
+        rowCount = node.rowCount()
+        columnCount = node.columnCount()
+        rowSpan = node.rowSpan()
+        columnSpan = node.columnSpan()
+
+        accessibilityFocused = node.isAccessibilityFocused
+        checked = node.isChecked
+        checkable = node.isCheckable
+        clickable = node.isClickable
+        contextClickable = node.isContextClickable
+        dismissable = node.isDismissable
+        enabled = node.isEnabled
+        editable = node.isEditable
+        focusable = node.isFocusable
+        focused = node.focused()
+        longClickable = node.isLongClickable
+        selected = node.isSelected
+        scrollable = node.isScrollable
+        visibleToUser = node.visibleToUser()
+        node.getBoundsInScreen(boundsInScreen)
+        node.getBoundsInParent(boundsInParent)
+        bounds = boundsToString(boundsInScreen)
+        indexInParent = node.indexInParent()
+        if (resources != null && packageName != null && fullId != null) {
+            idHex = "0x" + Integer.toHexString(resources.getIdentifier(fullId, null, null))
+        }
+    }
+
+    private fun simplifyId(idResourceName: String?): String? {
+        if (idResourceName == null)
+            return null
+        val i = idResourceName.indexOf('/')
+        return idResourceName.substring(i + 1)
+    }
+
+    fun getChildren(): List<NodeInfo> {
+        return children
+    }
+
+    override fun toString(): String {
+        return className + "{" +
+                "childCount=" + children.size +
+                ", mBoundsInScreen=" + boundsInScreen +
+                ", mBoundsInParent=" + boundsInParent +
+                ", id='" + id + '\''.toString() +
+                ", desc='" + desc + '\''.toString() +
+                ", packageName='" + packageName + '\''.toString() +
+                ", text='" + text + '\''.toString() +
+                ", depth=" + depth +
+                ", drawingOrder=" + drawingOrder +
+                ", accessibilityFocused=" + accessibilityFocused +
+                ", checked=" + checked +
+                ", clickable=" + clickable +
+                ", contextClickable=" + contextClickable +
+                ", dismissable=" + dismissable +
+                ", editable=" + editable +
+                ", enabled=" + enabled +
+                ", focusable=" + focusable +
+                ", longClickable=" + longClickable +
+                ", row=" + row +
+                ", column=" + column +
+                ", rowCount=" + rowCount +
+                ", columnCount=" + columnCount +
+                ", rowSpan=" + rowSpan +
+                ", columnSpan=" + columnSpan +
+                ", selected=" + selected +
+                ", scrollable=" + scrollable +
+                ", bounds='" + bounds + '\''.toString() +
+                ", checkable=" + checkable +
+                ", focused=" + focused +
+                ", visibleToUser=" + visibleToUser +
+                ", parent=" + parent?.className +
+                '}'.toString()
+    }
+
+    companion object {
+
+        fun boundsToString(rect: Rect): String {
+            return rect.toString().replace('-', ',').replace(" ", "").substring(4)
+        }
+
+
+        internal fun capture(resourcesCache: HashMap<String, Resources>, context: Context, uiObject: UiObject, parent: NodeInfo?): NodeInfo {
+            val pkg = uiObject.packageName()
+            var resources: Resources? = null
+            if (pkg != null) {
+                resources = resourcesCache[pkg]
+                if (resources == null) {
+                    try {
+                        resources = context.packageManager.getResourcesForApplication(pkg)
+                        resourcesCache[pkg] = resources
+                    } catch (e: PackageManager.NameNotFoundException) {
+                        e.printStackTrace()
+                    }
+
+                }
+            }
+            val nodeInfo = NodeInfo(resources, uiObject, parent)
+            val childCount = uiObject.childCount
+            for (i in 0 until childCount) {
+                val child = uiObject.child(i)
+                if (child != null) {
+                    nodeInfo.children.add(capture(resourcesCache, context, child, nodeInfo))
+                }
+            }
+            return nodeInfo
+        }
+
+        fun capture(context: Context, root: AccessibilityNodeInfo): NodeInfo {
+            val r = UiObject.createRoot(root)
+            val resourcesCache = HashMap<String, Resources>()
+            return capture(resourcesCache, context, r, null)
+        }
+    }
+}
diff --git a/automator/src/main/java/com/stardust/view/accessibility/NotificationListener.java b/automator/src/main/java/com/stardust/view/accessibility/NotificationListener.java
deleted file mode 100644
index f43911cc..00000000
--- a/automator/src/main/java/com/stardust/view/accessibility/NotificationListener.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.stardust.view.accessibility;
-
-import android.accessibilityservice.AccessibilityService;
-import android.content.Context;
-import android.service.notification.StatusBarNotification;
-import android.support.annotation.Nullable;
-import android.util.Log;
-import android.view.accessibility.AccessibilityEvent;
-
-import com.stardust.notification.Notification;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Set;
-import java.util.concurrent.CopyOnWriteArrayList;
-
-/**
- * Created by Stardust on 2017/8/1.
- */
-
-public interface NotificationListener {
-
-
-    void onNotification(Notification notification);
-
-
-}
diff --git a/automator/src/main/java/com/stardust/view/accessibility/NotificationListener.kt b/automator/src/main/java/com/stardust/view/accessibility/NotificationListener.kt
new file mode 100644
index 00000000..ee490b29
--- /dev/null
+++ b/automator/src/main/java/com/stardust/view/accessibility/NotificationListener.kt
@@ -0,0 +1,25 @@
+package com.stardust.view.accessibility
+
+import android.accessibilityservice.AccessibilityService
+import android.content.Context
+import android.service.notification.StatusBarNotification
+import android.util.Log
+import android.view.accessibility.AccessibilityEvent
+
+import com.stardust.notification.Notification
+
+import java.util.ArrayList
+import java.util.Collections
+import java.util.concurrent.CopyOnWriteArrayList
+
+/**
+ * Created by Stardust on 2017/8/1.
+ */
+
+interface NotificationListener {
+
+
+    fun onNotification(notification: Notification)
+
+
+}
diff --git a/automator/src/main/java/com/stardust/view/accessibility/OnKeyListener.java b/automator/src/main/java/com/stardust/view/accessibility/OnKeyListener.java
deleted file mode 100644
index 0453a6ef..00000000
--- a/automator/src/main/java/com/stardust/view/accessibility/OnKeyListener.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.stardust.view.accessibility;
-
-import android.util.Log;
-import android.view.KeyEvent;
-import android.view.View;
-
-import java.util.concurrent.CopyOnWriteArrayList;
-
-/**
- * Created by Stardust on 2017/7/18.
- */
-
-public interface OnKeyListener {
-
-    void onKeyEvent(int keyCode, KeyEvent event);
-
-    class Observer implements OnKeyListener {
-
-        private static final String TAG = "OnKeyListenerObserver";
-
-        private CopyOnWriteArrayList<OnKeyListener> mOnKeyListeners = new CopyOnWriteArrayList<>();
-
-        @Override
-        public void onKeyEvent(int keyCode, KeyEvent event) {
-            for (OnKeyListener listener : mOnKeyListeners) {
-                try {
-                    listener.onKeyEvent(keyCode, event);
-                } catch (Exception e) {
-                    Log.e(TAG, "Error OnKeyEvent: " + event + " Listener: " + listener, e);
-                }
-            }
-        }
-
-        public void addListener(OnKeyListener listener) {
-            mOnKeyListeners.add(listener);
-        }
-
-        public boolean removeListener(OnKeyListener listener) {
-            return mOnKeyListeners.remove(listener);
-        }
-    }
-}
diff --git a/automator/src/main/java/com/stardust/view/accessibility/OnKeyListener.kt b/automator/src/main/java/com/stardust/view/accessibility/OnKeyListener.kt
new file mode 100644
index 00000000..575a34ca
--- /dev/null
+++ b/automator/src/main/java/com/stardust/view/accessibility/OnKeyListener.kt
@@ -0,0 +1,45 @@
+package com.stardust.view.accessibility
+
+import android.util.Log
+import android.view.KeyEvent
+import android.view.View
+
+import java.util.concurrent.CopyOnWriteArrayList
+
+/**
+ * Created by Stardust on 2017/7/18.
+ */
+
+interface OnKeyListener {
+
+    fun onKeyEvent(keyCode: Int, event: KeyEvent)
+
+    class Observer : OnKeyListener {
+
+        private val mOnKeyListeners = CopyOnWriteArrayList<OnKeyListener>()
+
+        override fun onKeyEvent(keyCode: Int, event: KeyEvent) {
+            for (listener in mOnKeyListeners) {
+                try {
+                    listener.onKeyEvent(keyCode, event)
+                } catch (e: Exception) {
+                    Log.e(TAG, "Error OnKeyEvent: $event Listener: $listener", e)
+                }
+
+            }
+        }
+
+        fun addListener(listener: OnKeyListener) {
+            mOnKeyListeners.add(listener)
+        }
+
+        fun removeListener(listener: OnKeyListener): Boolean {
+            return mOnKeyListeners.remove(listener)
+        }
+
+        companion object {
+
+            private val TAG = "OnKeyListenerObserver"
+        }
+    }
+}
diff --git a/automator/src/test/java/com/stardust/automator/ExampleUnitTest.java b/automator/src/test/java/com/stardust/automator/ExampleUnitTest.java
deleted file mode 100644
index 92a7cd0d..00000000
--- a/automator/src/test/java/com/stardust/automator/ExampleUnitTest.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.stardust.automator;
-
-
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-/**
- * Example local unit test, which will execute on the development machine (host).
- *
- * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
- */
-public class ExampleUnitTest {
-    @Test
-    public void addition_isCorrect() throws Exception {
-
-    }
-}
\ No newline at end of file
diff --git a/automator/src/test/java/com/stardust/automator/ExampleUnitTest.kt b/automator/src/test/java/com/stardust/automator/ExampleUnitTest.kt
new file mode 100644
index 00000000..5adca8bd
--- /dev/null
+++ b/automator/src/test/java/com/stardust/automator/ExampleUnitTest.kt
@@ -0,0 +1,19 @@
+package com.stardust.automator
+
+
+import org.junit.Test
+
+import org.junit.Assert.*
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * @see [Testing documentation](http://d.android.com/tools/testing)
+ */
+class ExampleUnitTest {
+    @Test
+    @Throws(Exception::class)
+    fun addition_isCorrect() {
+
+    }
+}
\ No newline at end of file
diff --git a/automator/src/test/java/com/stardust/automator/filter/DfsFilterTest.java b/automator/src/test/java/com/stardust/automator/filter/DfsFilterTest.java
deleted file mode 100644
index 93162f3e..00000000
--- a/automator/src/test/java/com/stardust/automator/filter/DfsFilterTest.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.stardust.automator.filter;
-
-import com.stardust.automator.test.TestUiObject;
-import com.stardust.automator.UiObject;
-
-import org.junit.Test;
-
-import java.util.List;
-import java.util.Random;
-
-import static org.junit.Assert.*;
-
-/**
- * Created by Stardust on 2017/5/5.
- */
-public class DfsFilterTest {
-
-    private static class RandomDfsFilter extends DfsFilter {
-
-        private Random mRandom = new Random();
-
-        @Override
-        protected boolean isIncluded(UiObject nodeInfo) {
-            return mRandom.nextBoolean();
-        }
-    }
-
-    @Test
-    public void filter() throws Exception {
-        DfsFilter filter = new RandomDfsFilter();
-        UiObject root = new TestUiObject(10);
-        List<UiObject> list = filter.filter(root);
-        for (UiObject uiObject : list) {
-            if (root != uiObject)
-                uiObject.recycle();
-        }
-        System.out.println(TestUiObject.max);
-        assertEquals(1, TestUiObject.count);
-    }
-
-}
\ No newline at end of file
diff --git a/automator/src/test/java/com/stardust/automator/filter/DfsFilterTest.kt b/automator/src/test/java/com/stardust/automator/filter/DfsFilterTest.kt
new file mode 100644
index 00000000..7a644d5c
--- /dev/null
+++ b/automator/src/test/java/com/stardust/automator/filter/DfsFilterTest.kt
@@ -0,0 +1,40 @@
+package com.stardust.automator.filter
+
+import com.stardust.automator.test.TestUiObject
+import com.stardust.automator.UiObject
+import com.stardust.automator.search.DFS
+
+import org.junit.Test
+import java.util.Random
+
+import org.junit.Assert.*
+
+/**
+ * Created by Stardust on 2017/5/5.
+ */
+class DfsFilterTest {
+
+    private class RandomFilter : Filter {
+
+        private val mRandom = Random()
+
+        override fun filter(node: UiObject): Boolean {
+            return mRandom.nextBoolean()
+        }
+    }
+
+    @Test
+    @Throws(Exception::class)
+    fun filter() {
+        val filter = RandomFilter()
+        val root = TestUiObject(10)
+        val list = DFS(filter).search(root)
+        for (uiObject in list) {
+            if (root !== uiObject)
+                uiObject.recycle()
+        }
+        println(TestUiObject.max)
+        assertEquals(1, TestUiObject.count.toLong())
+    }
+
+}
\ No newline at end of file
diff --git a/automator/src/test/java/com/stardust/automator/simple_action/ScrollActionTest.java b/automator/src/test/java/com/stardust/automator/simple_action/ScrollActionTest.java
deleted file mode 100644
index 24613e64..00000000
--- a/automator/src/test/java/com/stardust/automator/simple_action/ScrollActionTest.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.stardust.automator.simple_action;
-
-import android.view.accessibility.AccessibilityNodeInfo;
-
-import com.stardust.automator.test.TestUiObject;
-import com.stardust.automator.UiObject;
-
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-/**
- * Created by Stardust on 2017/5/5.
- */
-public class ScrollActionTest {
-    @Test
-    public void perform() throws Exception {
-        ScrollAction action = new ScrollAction(AccessibilityNodeInfo.ACTION_SCROLL_BACKWARD, 0);
-        UiObject root = new TestUiObject(5);
-        action.perform(root);
-        System.out.println(TestUiObject.max);
-        assertEquals(1, TestUiObject.count);
-    }
-
-}
\ No newline at end of file
diff --git a/automator/src/test/java/com/stardust/automator/simple_action/ScrollActionTest.kt b/automator/src/test/java/com/stardust/automator/simple_action/ScrollActionTest.kt
new file mode 100644
index 00000000..e23e2557
--- /dev/null
+++ b/automator/src/test/java/com/stardust/automator/simple_action/ScrollActionTest.kt
@@ -0,0 +1,26 @@
+package com.stardust.automator.simple_action
+
+import android.view.accessibility.AccessibilityNodeInfo
+
+import com.stardust.automator.test.TestUiObject
+import com.stardust.automator.UiObject
+
+import org.junit.Test
+
+import org.junit.Assert.*
+
+/**
+ * Created by Stardust on 2017/5/5.
+ */
+class ScrollActionTest {
+    @Test
+    @Throws(Exception::class)
+    fun perform() {
+        val action = ScrollAction(AccessibilityNodeInfo.ACTION_SCROLL_BACKWARD, 0)
+        val root = TestUiObject(5)
+        action.perform(root)
+        println(TestUiObject.max)
+        assertEquals(1, TestUiObject.count.toLong())
+    }
+
+}
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 152d19e9..a50fb89e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,12 +3,15 @@ import groovy.json.JsonSlurper
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
+    ext.kotlin_version = '1.3.10'
     repositories {
         google()
         jcenter()
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+        classpath 'com.jakewharton:butterknife-gradle-plugin:9.0.0-rc2'
 
     }
 }
diff --git a/common/build.gradle b/common/build.gradle
index 445f3e62..0ee577bd 100644
--- a/common/build.gradle
+++ b/common/build.gradle
@@ -1,4 +1,6 @@
 apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-android-extensions'
 
 android {
     compileSdkVersion versions.compile
@@ -10,7 +12,7 @@ android {
         versionCode 1
         versionName "1.0"
 
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
     }
 
@@ -23,10 +25,11 @@ android {
 }
 
 dependencies {
-    androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
+    androidTestImplementation('androidx.test.espresso:espresso-core:3.1.1-alpha01', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
     testImplementation 'junit:junit:4.12'
-    api 'com.android.support:support-annotations:28.0.0'
+    api "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    api 'androidx.annotation:annotation:1.0.0'
     api 'com.github.hyb1996:settingscompat:1.1.5'
 }
diff --git a/common/release/output.json b/common/release/output.json
index fc934f52..cf367a7b 100644
--- a/common/release/output.json
+++ b/common/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":433,"versionName":"4.0.4 Alpha4","enabled":true,"outputFile":"commonRelease-4.0.4 Alpha4.apk","fullName":"commonRelease","baseName":"common-release"},"path":"commonRelease-4.0.4 Alpha4.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":453,"versionName":"4.1.0 Alpha3","enabled":true,"outputFile":"commonRelease-4.1.0 Alpha3.apk","fullName":"commonRelease","baseName":"common-release"},"path":"commonRelease-4.1.0 Alpha3.apk","properties":{}}]
\ No newline at end of file
diff --git a/common/src/androidTest/java/com/stardust/ExampleInstrumentedTest.java b/common/src/androidTest/java/com/stardust/ExampleInstrumentedTest.java
index 46520167..d8c922db 100644
--- a/common/src/androidTest/java/com/stardust/ExampleInstrumentedTest.java
+++ b/common/src/androidTest/java/com/stardust/ExampleInstrumentedTest.java
@@ -1,8 +1,8 @@
 package com.stardust;
 
 import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/common/src/main/java/android/widget/TextViewHelper.java b/common/src/main/java/android/widget/TextViewHelper.java
new file mode 100644
index 00000000..1742331d
--- /dev/null
+++ b/common/src/main/java/android/widget/TextViewHelper.java
@@ -0,0 +1,30 @@
+package android.widget;
+
+import java.lang.reflect.Field;
+
+public class TextViewHelper {
+
+    private static final Field sSavedStateText;
+
+    static {
+        Field text = null;
+        try {
+            text = TextView.SavedState.class.getDeclaredField("text");
+            text.setAccessible(true);
+        } catch (NoSuchFieldException e) {
+            e.printStackTrace();
+        }
+        sSavedStateText = text;
+    }
+
+    public static void setText(TextView.SavedState state, CharSequence text) {
+        if (sSavedStateText == null) {
+            return;
+        }
+        try {
+            sSavedStateText.set(state, text);
+        } catch (IllegalAccessException e) {
+            e.printStackTrace();
+        }
+    }
+}
diff --git a/common/src/main/java/com/stardust/app/AppOps.kt b/common/src/main/java/com/stardust/app/AppOps.kt
new file mode 100644
index 00000000..40b7bb51
--- /dev/null
+++ b/common/src/main/java/com/stardust/app/AppOps.kt
@@ -0,0 +1,20 @@
+package com.stardust.app
+
+import android.app.AppOpsManager
+import android.content.Context
+import android.content.pm.PackageManager
+import android.os.Build
+import androidx.annotation.RequiresApi
+
+
+@RequiresApi(Build.VERSION_CODES.KITKAT)
+fun Context.isOpPermissionGranted(permission: String): Boolean {
+    val appOps = getSystemService(Context.APP_OPS_SERVICE) as AppOpsManager
+    val mode = appOps.checkOpNoThrow(permission, android.os.Process.myUid(), packageName)
+
+    return if (mode == AppOpsManager.MODE_DEFAULT && Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+        checkCallingOrSelfPermission(android.Manifest.permission.PACKAGE_USAGE_STATS) == PackageManager.PERMISSION_GRANTED
+    } else {
+        mode == AppOpsManager.MODE_ALLOWED
+    }
+}
\ No newline at end of file
diff --git a/common/src/main/java/com/stardust/app/Fragment.java b/common/src/main/java/com/stardust/app/Fragment.java
index 265ad096..d6adbe22 100644
--- a/common/src/main/java/com/stardust/app/Fragment.java
+++ b/common/src/main/java/com/stardust/app/Fragment.java
@@ -1,8 +1,8 @@
 package com.stardust.app;
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -13,7 +13,7 @@ import com.stardust.util.ViewUtil;
  * Created by Stardust on 2017/1/30.
  */
 
-public abstract class Fragment extends android.support.v4.app.Fragment {
+public abstract class Fragment extends androidx.fragment.app.Fragment {
 
     private View mView;
 
diff --git a/common/src/main/java/com/stardust/app/FragmentPagerAdapterBuilder.java b/common/src/main/java/com/stardust/app/FragmentPagerAdapterBuilder.java
index 7e830be5..68412685 100644
--- a/common/src/main/java/com/stardust/app/FragmentPagerAdapterBuilder.java
+++ b/common/src/main/java/com/stardust/app/FragmentPagerAdapterBuilder.java
@@ -1,9 +1,9 @@
 package com.stardust.app;
 
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentActivity;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentPagerAdapter;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentPagerAdapter;
 import android.util.SparseArray;
 import android.view.ViewGroup;
 
diff --git a/common/src/main/java/com/stardust/app/GlobalAppContext.java b/common/src/main/java/com/stardust/app/GlobalAppContext.java
index 6915d4a2..4b5391a8 100644
--- a/common/src/main/java/com/stardust/app/GlobalAppContext.java
+++ b/common/src/main/java/com/stardust/app/GlobalAppContext.java
@@ -6,7 +6,7 @@ import android.content.Context;
 import android.os.Build;
 import android.os.Handler;
 import android.os.Looper;
-import android.support.annotation.RequiresApi;
+import androidx.annotation.RequiresApi;
 import android.widget.Toast;
 
 /**
@@ -69,6 +69,19 @@ public class GlobalAppContext {
         });
     }
 
+    public static void toast(final int resId, final Object... args) {
+        if (Looper.myLooper() == Looper.getMainLooper()) {
+            Toast.makeText(get(), getString(resId, args), Toast.LENGTH_SHORT).show();
+            return;
+        }
+        sHandler.post(new Runnable() {
+            @Override
+            public void run() {
+                Toast.makeText(get(), getString(resId, args), Toast.LENGTH_SHORT).show();
+            }
+        });
+    }
+
     public static void post(Runnable r) {
         sHandler.post(r);
     }
diff --git a/common/src/main/java/com/stardust/app/MenuUtils.java b/common/src/main/java/com/stardust/app/MenuUtils.java
index a4f9a918..6b590a53 100644
--- a/common/src/main/java/com/stardust/app/MenuUtils.java
+++ b/common/src/main/java/com/stardust/app/MenuUtils.java
@@ -1,7 +1,7 @@
 package com.stardust.app;
 
 import android.graphics.drawable.Drawable;
-import android.support.v4.graphics.drawable.DrawableCompat;
+import androidx.core.graphics.drawable.DrawableCompat;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.SubMenu;
diff --git a/common/src/main/java/com/stardust/app/OnActivityResultDelegate.java b/common/src/main/java/com/stardust/app/OnActivityResultDelegate.java
index 03f49ee1..a8017895 100644
--- a/common/src/main/java/com/stardust/app/OnActivityResultDelegate.java
+++ b/common/src/main/java/com/stardust/app/OnActivityResultDelegate.java
@@ -1,7 +1,7 @@
 package com.stardust.app;
 
 import android.content.Intent;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.util.SparseArray;
 
 import java.util.ArrayList;
diff --git a/common/src/main/java/com/stardust/io/EFile.java b/common/src/main/java/com/stardust/io/EFile.java
index 8331bcf2..83f85a65 100644
--- a/common/src/main/java/com/stardust/io/EFile.java
+++ b/common/src/main/java/com/stardust/io/EFile.java
@@ -1,6 +1,6 @@
 package com.stardust.io;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import java.io.File;
 import java.net.URI;
diff --git a/common/src/main/java/com/stardust/io/Zip.java b/common/src/main/java/com/stardust/io/Zip.java
new file mode 100644
index 00000000..9e006709
--- /dev/null
+++ b/common/src/main/java/com/stardust/io/Zip.java
@@ -0,0 +1,49 @@
+package com.stardust.io;
+
+import com.stardust.pio.PFile;
+import com.stardust.pio.PFiles;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipInputStream;
+
+import static com.stardust.pio.PFiles.closeSilently;
+
+public class Zip {
+
+    public static void unzip(InputStream stream, File dir) throws IOException {
+        FileOutputStream fos = null;
+        ZipInputStream zis = null;
+        try {
+            zis = new ZipInputStream(stream);
+            ZipEntry entry;
+            while ((entry = zis.getNextEntry()) != null) {
+                File file = new File(dir, entry.getName());
+                if (entry.isDirectory()) {
+                    file.mkdirs();
+                } else {
+                    PFiles.ensureDir(file.getPath());
+                    fos = new FileOutputStream(file);
+                    PFiles.write(zis, fos, false);
+                    fos.close();
+                    fos = null;
+                    zis.closeEntry();
+                }
+            }
+        } finally {
+            closeSilently(fos);
+            closeSilently(stream);
+            closeSilently(zis);
+        }
+    }
+
+    public static void unzip(File zipFile, File dir) throws IOException {
+        unzip(new FileInputStream(zipFile), dir);
+    }
+
+
+}
diff --git a/common/src/main/java/com/stardust/pio/PFile.java b/common/src/main/java/com/stardust/pio/PFile.java
index 1fca3829..97d6feab 100644
--- a/common/src/main/java/com/stardust/pio/PFile.java
+++ b/common/src/main/java/com/stardust/pio/PFile.java
@@ -1,8 +1,7 @@
 package com.stardust.pio;
 
-import android.os.Environment;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import java.io.File;
 import java.io.FileFilter;
@@ -50,15 +49,19 @@ public class PFile extends File {
         mSimplifyPath = PFiles.getSimplifiedPath(getPath());
     }
 
-    public boolean renameTo(String newName) {
-        if (isDirectory())
-            return renameTo(new File(getParent(), newName));
-        else
-            return renameTo(new File(getParent(), newName + "." + getExtension()));
+
+    @NonNull
+    public PFile renameTo(String newName) {
+        PFile newFile = new PFile(getParent(), newName);
+        if (renameTo(newFile)) {
+            return newFile;
+        } else {
+            return this;
+        }
     }
 
-    @Nullable
-    public PFile renameAndReturnNewFile(String newName) {
+    @NonNull
+    public PFile renameWithoutExt(String newName) {
         PFile newFile = isDirectory() ? new PFile(getParent(), newName) :
                 new PFile(getParent(), newName + "." + getExtension());
         if (renameTo(newFile)) {
diff --git a/common/src/main/java/com/stardust/pio/PFiles.java b/common/src/main/java/com/stardust/pio/PFiles.java
index d61825c6..abb2fd0e 100644
--- a/common/src/main/java/com/stardust/pio/PFiles.java
+++ b/common/src/main/java/com/stardust/pio/PFiles.java
@@ -9,6 +9,7 @@ import android.util.Log;
 
 import com.stardust.util.Func1;
 
+import java.io.Closeable;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
@@ -135,6 +136,8 @@ public class PFiles {
             return new String(bytes, encoding);
         } catch (IOException e) {
             throw new UncheckedIOException(e);
+        } finally {
+            closeSilently(is);
         }
     }
 
@@ -174,20 +177,28 @@ public class PFiles {
         }
     }
 
-    public static void write(InputStream is, OutputStream os) {
+    public static void write(InputStream is, OutputStream os, boolean close) {
         byte[] buffer = new byte[DEFAULT_BUFFER_SIZE];
         try {
             while (is.available() > 0) {
                 int n = is.read(buffer);
-                os.write(buffer, 0, n);
+                if (n > 0) {
+                    os.write(buffer, 0, n);
+                }
+            }
+            if (close) {
+                is.close();
+                os.close();
             }
-            is.close();
-            os.close();
         } catch (IOException e) {
             throw new UncheckedIOException(e);
         }
     }
 
+    public static void write(InputStream is, OutputStream os) {
+        write(is, os, true);
+    }
+
 
     public static void write(String path, String text) {
         write(new File(path), text);
@@ -209,7 +220,7 @@ public class PFiles {
         }
     }
 
-    public static void write(FileOutputStream fileOutputStream, String text) {
+    public static void write(OutputStream fileOutputStream, String text) {
         write(fileOutputStream, text, "utf-8");
     }
 
@@ -217,9 +228,10 @@ public class PFiles {
     public static void write(OutputStream outputStream, String text, String encoding) {
         try {
             outputStream.write(text.getBytes(encoding));
-            outputStream.close();
         } catch (IOException e) {
             throw new UncheckedIOException(e);
+        } finally {
+            closeSilently(outputStream);
         }
     }
 
@@ -287,16 +299,15 @@ public class PFiles {
     }
 
 
-    public static void copyAssetDir(Context context, String assetsDir, String toDir, String[] list) throws IOException {
+    public static void copyAssetDir(AssetManager manager, String assetsDir, String toDir, String[] list) throws IOException {
         new File(toDir).mkdirs();
-        AssetManager manager = context.getAssets();
         if (list == null) {
             list = manager.list(assetsDir);
         }
         if (list == null)
             throw new IOException("not a directory: " + assetsDir);
         for (String file : list) {
-            if(TextUtils.isEmpty(file)){
+            if (TextUtils.isEmpty(file)) {
                 continue;
             }
             String fullAssetsPath = join(assetsDir, file);
@@ -314,7 +325,7 @@ public class PFiles {
                     }
                 }
             } else {
-                copyAssetDir(context, fullAssetsPath, join(toDir, file), children);
+                copyAssetDir(manager, fullAssetsPath, join(toDir, file), children);
             }
         }
     }
@@ -500,4 +511,15 @@ public class PFiles {
             throw new UncheckedIOException(e);
         }
     }
+
+    public static void closeSilently(Closeable closeable) {
+        if (closeable == null) {
+            return;
+        }
+        try {
+            closeable.close();
+        } catch (IOException ignored) {
+
+        }
+    }
 }
diff --git a/common/src/main/java/com/stardust/util/AdvancedEncryptionStandard.kt b/common/src/main/java/com/stardust/util/AdvancedEncryptionStandard.kt
new file mode 100644
index 00000000..5b8c9ee7
--- /dev/null
+++ b/common/src/main/java/com/stardust/util/AdvancedEncryptionStandard.kt
@@ -0,0 +1,42 @@
+package com.stardust.util
+
+import javax.crypto.Cipher
+import javax.crypto.spec.IvParameterSpec
+import javax.crypto.spec.SecretKeySpec
+
+class AdvancedEncryptionStandard(private val key: ByteArray, private val initVector: String) {
+
+    /**
+     * Encrypts the given plain text
+     *
+     * @param plainText The plain text to encrypt
+     */
+    @Throws(Exception::class)
+    fun encrypt(plainText: ByteArray): ByteArray {
+        val secretKey = SecretKeySpec(key, ALGORITHM)
+        val cipher = Cipher.getInstance(FULL_ALGORITHM)
+        val ivParameterSpec = IvParameterSpec(initVector.toByteArray())
+        cipher.init(Cipher.ENCRYPT_MODE, secretKey, ivParameterSpec)
+        return cipher.doFinal(plainText)
+    }
+
+    /**
+     * Decrypts the given byte array
+     *
+     * @param cipherText The data to decrypt
+     */
+    @Throws(Exception::class)
+    fun decrypt(cipherText: ByteArray, start: Int = 0, end: Int = cipherText.size): ByteArray {
+        val secretKey = SecretKeySpec(key, ALGORITHM)
+        val ivParameterSpec = IvParameterSpec(initVector.toByteArray())
+        val cipher = Cipher.getInstance(FULL_ALGORITHM)
+        cipher.init(Cipher.DECRYPT_MODE, secretKey, ivParameterSpec)
+        return cipher.doFinal(cipherText, start, end - start)
+    }
+
+    companion object {
+
+        private const val ALGORITHM = "AES"
+        private const val FULL_ALGORITHM = "AES/CBC/PKCS5Padding"
+    }
+}
\ No newline at end of file
diff --git a/common/src/main/java/com/stardust/util/Array.kt b/common/src/main/java/com/stardust/util/Array.kt
new file mode 100644
index 00000000..261579f8
--- /dev/null
+++ b/common/src/main/java/com/stardust/util/Array.kt
@@ -0,0 +1,9 @@
+package com.stardust.util
+
+import java.util.*
+
+inline fun <reified T> sortedArrayOf(vararg elements: T): Array<T> {
+    val a = arrayOf(*elements)
+    Arrays.sort(a)
+    return a
+}
\ No newline at end of file
diff --git a/common/src/main/java/com/stardust/util/BiMap.java b/common/src/main/java/com/stardust/util/BiMap.java
index 65420801..10e526a7 100644
--- a/common/src/main/java/com/stardust/util/BiMap.java
+++ b/common/src/main/java/com/stardust/util/BiMap.java
@@ -8,4 +8,9 @@ public interface BiMap<K, V> extends Map<K, V> {
     K getKey(V value);
 
     Set<V> valueSet();
+
+    V getOr(K key, V def);
+
+    K getKeyOr(V value, K def);
+
 }
diff --git a/common/src/main/java/com/stardust/util/BiMaps.java b/common/src/main/java/com/stardust/util/BiMaps.java
index a809c5b4..c78b2f28 100644
--- a/common/src/main/java/com/stardust/util/BiMaps.java
+++ b/common/src/main/java/com/stardust/util/BiMaps.java
@@ -1,8 +1,8 @@
 package com.stardust.util;
 
 import android.os.Build;
-import android.support.annotation.NonNull;
-import android.support.annotation.RequiresApi;
+import androidx.annotation.NonNull;
+import androidx.annotation.RequiresApi;
 
 import java.util.Collection;
 import java.util.HashMap;
@@ -115,6 +115,18 @@ public class BiMaps {
             return mVKMap.keySet();
         }
 
+        @Override
+        public V getOr(K key, V def) {
+            V v = get(key);
+            return v == null ? def : v;
+        }
+
+        @Override
+        public K getKeyOr(V value, K def) {
+            K key = getKey(value);
+            return key == null ? def : key;
+        }
+
         @NonNull
         @Override
         public Collection<V> values() {
diff --git a/common/src/main/java/com/stardust/util/ClipboardUtil.java b/common/src/main/java/com/stardust/util/ClipboardUtil.java
index ba7abe38..2053b3dc 100644
--- a/common/src/main/java/com/stardust/util/ClipboardUtil.java
+++ b/common/src/main/java/com/stardust/util/ClipboardUtil.java
@@ -3,7 +3,8 @@ package com.stardust.util;
 import android.content.ClipData;
 import android.content.ClipboardManager;
 import android.content.Context;
-import android.support.annotation.NonNull;
+
+import androidx.annotation.NonNull;
 
 
 /**
@@ -18,7 +19,8 @@ public class ClipboardUtil {
     }
 
     public static CharSequence getClip(Context context) {
-        return ((ClipboardManager) context.getSystemService(Context.CLIPBOARD_SERVICE)).getPrimaryClip().getItemAt(0).getText();
+        ClipData clip = ((ClipboardManager) context.getSystemService(Context.CLIPBOARD_SERVICE)).getPrimaryClip();
+        return (clip == null || clip.getItemCount() == 0) ? null : clip.getItemAt(0).getText();
     }
 
     @NonNull
diff --git a/common/src/main/java/com/stardust/util/Consumer.java b/common/src/main/java/com/stardust/util/Consumer.java
index 590d7244..2a31f183 100644
--- a/common/src/main/java/com/stardust/util/Consumer.java
+++ b/common/src/main/java/com/stardust/util/Consumer.java
@@ -1,6 +1,6 @@
 package com.stardust.util;
 
-import android.support.annotation.Keep;
+import androidx.annotation.Keep;
 
 /**
  * Created by Stardust on 2017/3/10.
diff --git a/common/src/main/java/com/stardust/util/DeveloperUtils.java b/common/src/main/java/com/stardust/util/DeveloperUtils.java
index 206c188b..7f01fd34 100644
--- a/common/src/main/java/com/stardust/util/DeveloperUtils.java
+++ b/common/src/main/java/com/stardust/util/DeveloperUtils.java
@@ -9,18 +9,13 @@ import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.ServiceInfo;
 import android.content.pm.Signature;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.util.Base64;
-import android.util.Log;
-
-import com.stardust.R;
 
 import java.io.IOException;
 import java.lang.ref.WeakReference;
-import java.lang.reflect.Method;
 import java.security.MessageDigest;
 import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
 
diff --git a/common/src/main/java/com/stardust/util/DrawerAutoClose.java b/common/src/main/java/com/stardust/util/DrawerAutoClose.java
index df13b073..272aca56 100644
--- a/common/src/main/java/com/stardust/util/DrawerAutoClose.java
+++ b/common/src/main/java/com/stardust/util/DrawerAutoClose.java
@@ -1,9 +1,7 @@
 package com.stardust.util;
 
 import android.app.Activity;
-import android.support.v4.widget.DrawerLayout;
-
-import com.stardust.util.BackPressedHandler;
+import androidx.drawerlayout.widget.DrawerLayout;
 
 /**
  * Created by Stardust on 2017/6/19.
diff --git a/common/src/main/java/com/stardust/util/IntentUtil.java b/common/src/main/java/com/stardust/util/IntentUtil.java
index 148979ee..2620b03b 100644
--- a/common/src/main/java/com/stardust/util/IntentUtil.java
+++ b/common/src/main/java/com/stardust/util/IntentUtil.java
@@ -4,8 +4,12 @@ import android.content.ActivityNotFoundException;
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
-import android.support.annotation.Nullable;
-import android.support.v4.content.FileProvider;
+
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
+import androidx.core.content.FileProvider;
+
+import android.os.Build;
 import android.widget.Toast;
 
 import com.stardust.R;
@@ -134,6 +138,24 @@ public class IntentUtil {
         return uri;
     }
 
+    public static boolean viewFile(Context context, Uri uri, String mimeType, String fileProviderAuthority) {
+        if (uri.getScheme().equals("file")) {
+            return viewFile(context, uri.getPath(), mimeType, fileProviderAuthority);
+        } else {
+            try {
+                context.startActivity(new Intent(Intent.ACTION_VIEW)
+                        .setDataAndType(uri, mimeType)
+                        .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                        .addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
+                        .addFlags(Intent.FLAG_GRANT_WRITE_URI_PERMISSION));
+                return true;
+            } catch (Exception e) {
+                e.printStackTrace();
+                return false;
+            }
+        }
+    }
+
     public static boolean viewFile(Context context, String path, String mimeType, String fileProviderAuthority) {
         try {
             Uri uri = getUriOfFile(context, path, fileProviderAuthority);
@@ -164,4 +186,15 @@ public class IntentUtil {
             return false;
         }
     }
+
+    @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
+    public static void requestAppUsagePermission(Context context) {
+        Intent intent = new Intent(android.provider.Settings.ACTION_USAGE_ACCESS_SETTINGS);
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        try {
+            context.startActivity(intent);
+        } catch (ActivityNotFoundException e) {
+            e.printStackTrace();
+        }
+    }
 }
diff --git a/common/src/main/java/com/stardust/util/MD5.java b/common/src/main/java/com/stardust/util/MD5.java
index 824a37b7..aaa6f69c 100644
--- a/common/src/main/java/com/stardust/util/MD5.java
+++ b/common/src/main/java/com/stardust/util/MD5.java
@@ -5,13 +5,17 @@ import java.security.NoSuchAlgorithmException;
 
 public class MD5 {
 
-    public static byte[] md5Bytes(String message) throws NoSuchAlgorithmException {
-        MessageDigest md5 = MessageDigest.getInstance("MD5");
-        md5.update(message.getBytes());
-        return md5.digest();
+    public static byte[] md5Bytes(String message) {
+        try {
+            MessageDigest md5 = MessageDigest.getInstance("MD5");
+            md5.update(message.getBytes());
+            return md5.digest();
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
     }
 
-    public static String md5(String message) throws NoSuchAlgorithmException {
+    public static String md5(String message) {
         byte[] bytes = md5Bytes(message);
         StringBuilder hexString = new StringBuilder(32);
         for (byte b : bytes) {
@@ -22,5 +26,7 @@ public class MD5 {
             hexString.append(hex);
         }
         return hexString.toString();
+
+
     }
 }
diff --git a/common/src/main/java/com/stardust/util/MimeTypes.java b/common/src/main/java/com/stardust/util/MimeTypes.java
index ac8e3020..debc77ef 100644
--- a/common/src/main/java/com/stardust/util/MimeTypes.java
+++ b/common/src/main/java/com/stardust/util/MimeTypes.java
@@ -1,7 +1,7 @@
 package com.stardust.util;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.webkit.MimeTypeMap;
 
 import static com.stardust.pio.PFiles.getExtension;
diff --git a/common/src/main/java/com/stardust/util/ObjectHelper.java b/common/src/main/java/com/stardust/util/ObjectHelper.java
index 090e6609..97384662 100644
--- a/common/src/main/java/com/stardust/util/ObjectHelper.java
+++ b/common/src/main/java/com/stardust/util/ObjectHelper.java
@@ -13,4 +13,6 @@ public class ObjectHelper {
             throw new NullPointerException();
         }
     }
+
+
 }
diff --git a/common/src/main/java/com/stardust/util/Objects.java b/common/src/main/java/com/stardust/util/Objects.java
index 8af62d0f..17466d6a 100644
--- a/common/src/main/java/com/stardust/util/Objects.java
+++ b/common/src/main/java/com/stardust/util/Objects.java
@@ -24,4 +24,17 @@ public class Objects {
     public static boolean equals(Object a, Object b) {
         return (a == b) || (a != null && a.equals(b));
     }
+
+    /**
+     * Returns the hash code of a non-{@code null} argument and 0 for
+     * a {@code null} argument.
+     *
+     * @param o an object
+     * @return the hash code of a non-{@code null} argument and 0 for
+     * a {@code null} argument
+     * @see Object#hashCode
+     */
+    public static int hashCode(Object o) {
+        return o != null ? o.hashCode() : 0;
+    }
 }
diff --git a/common/src/main/java/com/stardust/util/ResourceMonitor.java b/common/src/main/java/com/stardust/util/ResourceMonitor.java
new file mode 100644
index 00000000..c7a4fa86
--- /dev/null
+++ b/common/src/main/java/com/stardust/util/ResourceMonitor.java
@@ -0,0 +1,124 @@
+package com.stardust.util;
+
+import android.os.Handler;
+import android.os.Looper;
+import android.util.Log;
+import android.util.SparseArray;
+
+import com.stardust.BuildConfig;
+
+import java.util.concurrent.ConcurrentHashMap;
+
+
+public final class ResourceMonitor {
+
+    private static final String LOG_TAG = "ResourceMonitor";
+
+    private static final ConcurrentHashMap<Class<?>, SparseArray<Exception>> mResources = new ConcurrentHashMap<>();
+    private static Handler sHandler;
+    private static boolean sEnabled = BuildConfig.DEBUG;
+    private static ExceptionCreator sExceptionCreator;
+    private static UnclosedResourceDetectedHandler sUnclosedResourceDetectedHandler;
+
+    public static void setExceptionCreator(ExceptionCreator exceptionCreator) {
+        sExceptionCreator = exceptionCreator;
+    }
+
+    public static void setUnclosedResourceDetectedHandler(UnclosedResourceDetectedHandler unclosedResourceDetectedHandler) {
+        sUnclosedResourceDetectedHandler = unclosedResourceDetectedHandler;
+    }
+
+    public static void onOpen(ResourceMonitor.Resource resource) {
+        if (!sEnabled) {
+            return;
+        }
+        SparseArray<Exception> map = mResources.get(resource.getClass());
+        if (map == null) {
+            map = new SparseArray<>();
+            mResources.put(resource.getClass(), map);
+        }
+        int resourceId = resource.getResourceId();
+        Exception exception;
+        if (sExceptionCreator == null) {
+            exception = new ResourceMonitor.UnclosedResourceException(resource);
+            exception.fillInStackTrace();
+        } else {
+            exception = sExceptionCreator.create(resource);
+        }
+        map.put(resourceId, exception);
+    }
+
+    public static void onClose(ResourceMonitor.Resource resource) {
+        if (!sEnabled) {
+            return;
+        }
+        SparseArray map = mResources.get(resource.getClass());
+        if (map != null) {
+            map.remove(resource.getResourceId());
+        }
+    }
+
+    public static void onFinalize(ResourceMonitor.Resource resource) {
+        if (!sEnabled) {
+            return;
+        }
+        SparseArray<Exception> map = mResources.get(resource.getClass());
+        if (map != null) {
+            int indexOfKey = map.indexOfKey(resource.getResourceId());
+            if (indexOfKey >= 0) {
+                final Exception exception = map.valueAt(indexOfKey);
+                map.removeAt(indexOfKey);
+                if (sHandler == null) {
+                    sHandler = new Handler(Looper.getMainLooper());
+                }
+                sHandler.post(new Runnable() {
+                    public final void run() {
+                        UnclosedResourceDetectedException detectedException = new UnclosedResourceDetectedException(exception);
+                        detectedException.fillInStackTrace();
+                        Log.w(LOG_TAG, "UnclosedResourceDetected", detectedException);
+                        if (sUnclosedResourceDetectedHandler != null) {
+                            sUnclosedResourceDetectedHandler.onUnclosedResourceDetected(detectedException);
+                        } else {
+                            throw detectedException;
+                        }
+                    }
+                });
+            }
+        }
+    }
+
+    public static boolean isEnabled() {
+        return sEnabled;
+    }
+
+    public static void setEnabled(boolean mEnabled) {
+        ResourceMonitor.sEnabled = mEnabled;
+    }
+
+    public static final class UnclosedResourceException extends RuntimeException {
+        public UnclosedResourceException(Resource resource) {
+            super("id = " + resource.getResourceId() + ", resource = " + resource);
+        }
+
+    }
+
+
+    public static final class UnclosedResourceDetectedException extends RuntimeException {
+        public UnclosedResourceDetectedException(Throwable cause) {
+            super(cause);
+        }
+    }
+
+    public interface Resource {
+        int getResourceId();
+    }
+
+    public interface ExceptionCreator {
+        Exception create(Resource resource);
+    }
+
+    public interface UnclosedResourceDetectedHandler {
+
+        void onUnclosedResourceDetected(UnclosedResourceDetectedException detectedException);
+    }
+}
diff --git a/common/src/main/java/com/stardust/util/SparseArrayEntries.java b/common/src/main/java/com/stardust/util/SparseArrayEntries.java
index 0efb3514..9b050217 100644
--- a/common/src/main/java/com/stardust/util/SparseArrayEntries.java
+++ b/common/src/main/java/com/stardust/util/SparseArrayEntries.java
@@ -1,5 +1,6 @@
 package com.stardust.util;
 
+import androidx.annotation.NonNull;
 import android.util.SparseArray;
 
 /**
@@ -8,13 +9,14 @@ import android.util.SparseArray;
 
 public class SparseArrayEntries<E> {
 
-    private SparseArray<E> mSparseArray = new SparseArray<>();
+    private final SparseArray<E> mSparseArray = new SparseArray<>();
 
     public SparseArrayEntries<E> entry(int key, E value) {
         mSparseArray.put(key, value);
         return this;
     }
 
+    @NonNull
     public SparseArray<E> sparseArray() {
         return mSparseArray;
     }
diff --git a/common/src/main/java/com/stardust/util/TextUtils.java b/common/src/main/java/com/stardust/util/TextUtils.java
index c077ec87..03435990 100644
--- a/common/src/main/java/com/stardust/util/TextUtils.java
+++ b/common/src/main/java/com/stardust/util/TextUtils.java
@@ -1,6 +1,6 @@
 package com.stardust.util;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 /**
  * Created by Stardust on 2017/5/3.
diff --git a/common/src/main/java/com/stardust/util/ViewUtil.java b/common/src/main/java/com/stardust/util/ViewUtil.java
index 6d0ca1c1..61b58b54 100644
--- a/common/src/main/java/com/stardust/util/ViewUtil.java
+++ b/common/src/main/java/com/stardust/util/ViewUtil.java
@@ -2,11 +2,10 @@ package com.stardust.util;
 
 import android.app.Activity;
 import android.content.Context;
-import android.support.annotation.IdRes;
+import androidx.annotation.IdRes;
 import android.util.DisplayMetrics;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.RelativeLayout;
 
 /**
  * Created by Stardust on 2017/1/24.
diff --git a/gradle.properties b/gradle.properties
index d85e1728..3004cc89 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -18,3 +18,5 @@ systemProp.http.proxyHost=127.0.0.1
 org.gradle.jvmargs=-Xms8192m -Xmx8192m -Dfile.encoding=UTF-8
 systemProp.https.proxyHost=127.0.0.1
 systemProp.http.proxyPort=1080
+android.useAndroidX=true
+android.enableJetifier=true
diff --git a/inrt/build.gradle b/inrt/build.gradle
index 5b3f1ba3..fee72d65 100644
--- a/inrt/build.gradle
+++ b/inrt/build.gradle
@@ -1,4 +1,6 @@
 apply plugin: 'com.android.application'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-android-extensions'
 
 android {
     compileSdkVersion versions.compile
@@ -10,7 +12,8 @@ android {
         targetSdkVersion versions.target
         versionCode versions.appVersionCode - 200
         versionName versions.appVersionName
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        multiDexEnabled true
         ndk {
             abiFilters 'armeabi-v7a'
         }
@@ -78,7 +81,7 @@ repositories {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
+    androidTestImplementation('androidx.test.espresso:espresso-core:3.1.1-alpha01', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
     //Glide
diff --git a/inrt/src/androidTest/java/com/stardust/auojs/inrt/ExampleInstrumentedTest.java b/inrt/src/androidTest/java/com/stardust/auojs/inrt/ExampleInstrumentedTest.java
index c4dc2fb6..3c731a82 100644
--- a/inrt/src/androidTest/java/com/stardust/auojs/inrt/ExampleInstrumentedTest.java
+++ b/inrt/src/androidTest/java/com/stardust/auojs/inrt/ExampleInstrumentedTest.java
@@ -1,8 +1,8 @@
 package com.stardust.auojs.inrt;
 
 import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/inrt/src/main/AndroidManifest.xml b/inrt/src/main/AndroidManifest.xml
index 76116e60..be85b30c 100644
--- a/inrt/src/main/AndroidManifest.xml
+++ b/inrt/src/main/AndroidManifest.xml
@@ -25,9 +25,11 @@
         android:icon="@mipmap/ic_launcher"
         android:label="inrt"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme"
+        android:theme="@style/ScriptTheme"
+        android:usesCleartextTraffic="true"
+        tools:ignore="GoogleAppIndexingWarning"
         tools:replace="android:label, android:allowBackup"
-        tools:ignore="GoogleAppIndexingWarning">
+        tools:targetApi="m">
         <activity android:name=".LogActivity">
 
         </activity>
@@ -44,19 +46,6 @@
 
         <activity android:name=".SettingsActivity"/>
 
-        <service
-            android:name=".autojs.AccessibilityService"
-            android:label="inrt"
-            android:permission="android.permission.BIND_ACCESSIBILITY_SERVICE">
-            <intent-filter>
-                <action android:name="android.accessibilityservice.AccessibilityService"/>
-            </intent-filter>
-            <meta-data
-                android:name="android.accessibilityservice"
-                android:resource="@xml/accessibility_service_config"/>
-
-        </service>
-
         <service
             android:name="com.stardust.notification.NotificationListenerService"
             android:label="inrt"
@@ -65,6 +54,15 @@
                 <action android:name="android.service.notification.NotificationListenerService"/>
             </intent-filter>
         </service>
+        <provider
+            android:name="androidx.core.content.FileProvider"
+            android:authorities="org.autojs.autojs.inrt.fileprovider"
+            android:exported="false"
+            android:grantUriPermissions="true">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/provider_paths"/>
+        </provider>
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/inrt/src/main/assets/project/main.js b/inrt/src/main/assets/project/main.js
index 9d1ce76c..bbb7dc69 100644
--- a/inrt/src/main/assets/project/main.js
+++ b/inrt/src/main/assets/project/main.js
@@ -1 +1 @@
-console.error("打包出错啦~ 使用文件夹打包请把主脚本改名为main.js");
+Y�?����M�z��
\ No newline at end of file
diff --git a/inrt/src/main/assets/project/project.json b/inrt/src/main/assets/project/project.json
index d1374a71..3fd55d38 100644
--- a/inrt/src/main/assets/project/project.json
+++ b/inrt/src/main/assets/project/project.json
@@ -1,7 +1,13 @@
 {
-  "name": "Hello World",
-  "versionName": "1.0.0",
+  "assets": [],
+  "build": {
+    "build_id": "B883A485-9",
+    "build_number": 1,
+    "build_time": 1543638246643
+  },
+  "main": "main.js",
+  "name": "打包测试",
+  "packageName": "xx.xx",
   "versionCode": 1,
-  "packageName": "org.autojs.example",
-  "main": "main.js"
+  "versionName": "1.0.0"
 }
\ No newline at end of file
diff --git a/inrt/src/main/java/com/stardust/auojs/inrt/App.java b/inrt/src/main/java/com/stardust/auojs/inrt/App.java
deleted file mode 100644
index f62e8994..00000000
--- a/inrt/src/main/java/com/stardust/auojs/inrt/App.java
+++ /dev/null
@@ -1,84 +0,0 @@
-package com.stardust.auojs.inrt;
-
-import android.app.Application;
-import android.graphics.Bitmap;
-import android.graphics.drawable.Drawable;
-import android.net.Uri;
-import android.view.View;
-import android.widget.ImageView;
-
-import com.bumptech.glide.Glide;
-import com.bumptech.glide.request.target.SimpleTarget;
-import com.bumptech.glide.request.transition.Transition;
-import com.stardust.app.GlobalAppContext;
-import com.stardust.auojs.inrt.autojs.AutoJs;
-import com.stardust.auojs.inrt.autojs.GlobalKeyObserver;
-import com.stardust.autojs.core.ui.inflater.ImageLoader;
-import com.stardust.autojs.core.ui.inflater.util.Drawables;
-
-/**
- * Created by Stardust on 2017/7/1.
- */
-
-public class App extends Application {
-
-
-    @Override
-    public void onCreate() {
-        super.onCreate();
-        GlobalAppContext.set(this);
-        AutoJs.initInstance(this);
-        GlobalKeyObserver.init();
-        Drawables.setDefaultImageLoader(new ImageLoader() {
-            @Override
-            public void loadInto(ImageView imageView, Uri uri) {
-                Glide.with(App.this)
-                        .load(uri)
-                        .into(imageView);
-            }
-
-            @Override
-            public void loadIntoBackground(View view, Uri uri) {
-                Glide.with(App.this)
-                        .load(uri)
-                        .into(new SimpleTarget<Drawable>() {
-                            @Override
-                            public void onResourceReady(Drawable resource, Transition<? super Drawable> transition) {
-                                view.setBackground(resource);
-                            }
-                        });
-            }
-
-            @Override
-            public Drawable load(View view, Uri uri) {
-                throw new UnsupportedOperationException();
-            }
-
-            @Override
-            public void load(View view, Uri uri, DrawableCallback drawableCallback) {
-                Glide.with(App.this)
-                        .load(uri)
-                        .into(new SimpleTarget<Drawable>() {
-                            @Override
-                            public void onResourceReady(Drawable resource, Transition<? super Drawable> transition) {
-                                drawableCallback.onLoaded(resource);
-                            }
-                        });
-            }
-
-            @Override
-            public void load(View view, Uri uri, BitmapCallback bitmapCallback) {
-                Glide.with(App.this)
-                        .asBitmap()
-                        .load(uri)
-                        .into(new SimpleTarget<Bitmap>() {
-                            @Override
-                            public void onResourceReady(Bitmap resource, Transition<? super Bitmap> transition) {
-                                bitmapCallback.onLoaded(resource);
-                            }
-                        });
-            }
-        });
-    }
-
-}
diff --git a/inrt/src/main/java/com/stardust/auojs/inrt/App.kt b/inrt/src/main/java/com/stardust/auojs/inrt/App.kt
new file mode 100644
index 00000000..64305346
--- /dev/null
+++ b/inrt/src/main/java/com/stardust/auojs/inrt/App.kt
@@ -0,0 +1,74 @@
+package com.stardust.auojs.inrt
+
+import android.app.Application
+import android.graphics.Bitmap
+import android.graphics.drawable.Drawable
+import android.net.Uri
+import android.view.View
+import android.widget.ImageView
+
+import com.bumptech.glide.Glide
+import com.bumptech.glide.request.target.SimpleTarget
+import com.bumptech.glide.request.transition.Transition
+import com.stardust.app.GlobalAppContext
+import com.stardust.auojs.inrt.autojs.AutoJs
+import com.stardust.auojs.inrt.autojs.GlobalKeyObserver
+import com.stardust.autojs.core.ui.inflater.ImageLoader
+import com.stardust.autojs.core.ui.inflater.util.Drawables
+
+/**
+ * Created by Stardust on 2017/7/1.
+ */
+
+class App : Application() {
+
+    override fun onCreate() {
+        super.onCreate()
+        GlobalAppContext.set(this)
+        AutoJs.initInstance(this)
+        GlobalKeyObserver.init()
+        Drawables.setDefaultImageLoader(object : ImageLoader {
+            override fun loadInto(imageView: ImageView, uri: Uri) {
+                Glide.with(this@App)
+                        .load(uri)
+                        .into(imageView)
+            }
+
+            override fun loadIntoBackground(view: View, uri: Uri) {
+                Glide.with(this@App)
+                        .load(uri)
+                        .into(object : SimpleTarget<Drawable>() {
+                            override fun onResourceReady(resource: Drawable, transition: Transition<in Drawable>) {
+                                view.background = resource
+                            }
+                        })
+            }
+
+            override fun load(view: View, uri: Uri): Drawable {
+                throw UnsupportedOperationException()
+            }
+
+            override fun load(view: View, uri: Uri, drawableCallback: ImageLoader.DrawableCallback) {
+                Glide.with(this@App)
+                        .load(uri)
+                        .into(object : SimpleTarget<Drawable>() {
+                            override fun onResourceReady(resource: Drawable, transition: Transition<in Drawable>) {
+                                drawableCallback.onLoaded(resource)
+                            }
+                        })
+            }
+
+            override fun load(view: View, uri: Uri, bitmapCallback: ImageLoader.BitmapCallback) {
+                Glide.with(this@App)
+                        .asBitmap()
+                        .load(uri)
+                        .into(object : SimpleTarget<Bitmap>() {
+                            override fun onResourceReady(resource: Bitmap, transition: Transition<in Bitmap>) {
+                                bitmapCallback.onLoaded(resource)
+                            }
+                        })
+            }
+        })
+    }
+
+}
diff --git a/inrt/src/main/java/com/stardust/auojs/inrt/LogActivity.java b/inrt/src/main/java/com/stardust/auojs/inrt/LogActivity.java
deleted file mode 100644
index b303015f..00000000
--- a/inrt/src/main/java/com/stardust/auojs/inrt/LogActivity.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package com.stardust.auojs.inrt;
-
-import android.Manifest;
-import android.content.Intent;
-import android.os.Build;
-import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.RequiresApi;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.View;
-
-import com.stardust.auojs.inrt.autojs.AutoJs;
-import com.stardust.auojs.inrt.launch.AssetsProjectLauncher;
-import com.stardust.auojs.inrt.launch.GlobalProjectLauncher;
-import com.stardust.autojs.core.console.ConsoleView;
-import com.stardust.autojs.core.console.StardustConsole;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import javax.microedition.khronos.opengles.GL;
-
-import static android.content.pm.PackageManager.PERMISSION_DENIED;
-import static android.content.pm.PackageManager.PERMISSION_GRANTED;
-
-public class LogActivity extends AppCompatActivity {
-
-
-    public static final String EXTRA_LAUNCH_SCRIPT = "launch_script";
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setupView();
-        if (getIntent().getBooleanExtra(EXTRA_LAUNCH_SCRIPT, false)) {
-            GlobalProjectLauncher.getInstance().launch(this);
-        }
-    }
-
-    private void setupView() {
-        setContentView(R.layout.activity_main);
-        Toolbar toolbar = findViewById(R.id.toolbar);
-        setSupportActionBar(toolbar);
-        ConsoleView consoleView = findViewById(R.id.console);
-        consoleView.setConsole((StardustConsole) AutoJs.getInstance().getGlobalConsole());
-        consoleView.findViewById(R.id.input_container).setVisibility(View.GONE);
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        startActivity(new Intent(this, SettingsActivity.class));
-        return true;
-    }
-
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        getMenuInflater().inflate(R.menu.menu_main, menu);
-        return true;
-    }
-}
diff --git a/inrt/src/main/java/com/stardust/auojs/inrt/LogActivity.kt b/inrt/src/main/java/com/stardust/auojs/inrt/LogActivity.kt
new file mode 100644
index 00000000..37378525
--- /dev/null
+++ b/inrt/src/main/java/com/stardust/auojs/inrt/LogActivity.kt
@@ -0,0 +1,50 @@
+package com.stardust.auojs.inrt
+
+import android.content.Intent
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
+import androidx.appcompat.widget.Toolbar
+import android.view.Menu
+import android.view.MenuItem
+import android.view.View
+
+import com.stardust.auojs.inrt.autojs.AutoJs
+import com.stardust.auojs.inrt.launch.GlobalProjectLauncher
+import com.stardust.autojs.core.console.ConsoleView
+import com.stardust.autojs.core.console.ConsoleImpl
+
+class LogActivity : AppCompatActivity() {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setupView()
+        if (intent.getBooleanExtra(EXTRA_LAUNCH_SCRIPT, false)) {
+            GlobalProjectLauncher.launch(this)
+        }
+    }
+
+    private fun setupView() {
+        setContentView(R.layout.activity_main)
+        val toolbar = findViewById<Toolbar>(R.id.toolbar)
+        setSupportActionBar(toolbar)
+        val consoleView = findViewById<ConsoleView>(R.id.console)
+        consoleView.setConsole(AutoJs.instance.globalConsole as ConsoleImpl)
+        consoleView.findViewById<View>(R.id.input_container).visibility = View.GONE
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        startActivity(Intent(this, SettingsActivity::class.java))
+        return true
+    }
+
+    override fun onCreateOptionsMenu(menu: Menu): Boolean {
+        menuInflater.inflate(R.menu.menu_main, menu)
+        return true
+    }
+
+    companion object {
+
+
+        val EXTRA_LAUNCH_SCRIPT = "launch_script"
+    }
+}
diff --git a/inrt/src/main/java/com/stardust/auojs/inrt/Pref.java b/inrt/src/main/java/com/stardust/auojs/inrt/Pref.java
deleted file mode 100644
index 7bc32f18..00000000
--- a/inrt/src/main/java/com/stardust/auojs/inrt/Pref.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package com.stardust.auojs.inrt;
-
-import android.content.SharedPreferences;
-import android.preference.PreferenceManager;
-
-import com.stardust.app.GlobalAppContext;
-
-/**
- * Created by Stardust on 2017/12/8.
- */
-
-public class Pref {
-
-    private static final String KEY_FIRST_USING = "key_first_using";
-    private static SharedPreferences sPreferences;
-
-    public static SharedPreferences getPreferences() {
-        if (sPreferences == null)
-            sPreferences = PreferenceManager.getDefaultSharedPreferences(GlobalAppContext.get());
-        return sPreferences;
-    }
-
-    public static boolean isStableModeEnabled() {
-        return getPreferences().getBoolean(getString(R.string.key_stable_mode), false);
-    }
-
-    private static String getString(int res) {
-        return GlobalAppContext.getString(res);
-    }
-
-    public static boolean shouldEnableAccessibilityServiceByRoot() {
-        return getPreferences().getBoolean(getString(R.string.key_enable_accessibility_service_by_root), false);
-    }
-
-    public static boolean shouldHideLogs() {
-        return getPreferences().getBoolean(getString(R.string.key_dont_show_main_activity), false);
-    }
-
-    public static boolean shouldStopAllScriptsWhenVolumeUp() {
-        return getPreferences().getBoolean(getString(R.string.key_use_volume_control_running), true);
-    }
-
-    public static boolean isFirstUsing() {
-        boolean firstUsing = getPreferences().getBoolean(KEY_FIRST_USING, true);
-        if (firstUsing) {
-            getPreferences().edit().putBoolean(KEY_FIRST_USING, false).apply();
-        }
-        return firstUsing;
-    }
-}
diff --git a/inrt/src/main/java/com/stardust/auojs/inrt/Pref.kt b/inrt/src/main/java/com/stardust/auojs/inrt/Pref.kt
new file mode 100644
index 00000000..8a20eb26
--- /dev/null
+++ b/inrt/src/main/java/com/stardust/auojs/inrt/Pref.kt
@@ -0,0 +1,48 @@
+package com.stardust.auojs.inrt
+
+import android.content.SharedPreferences
+import android.preference.PreferenceManager
+
+import com.stardust.app.GlobalAppContext
+
+/**
+ * Created by Stardust on 2017/12/8.
+ */
+
+object Pref {
+
+    private const val KEY_FIRST_USING = "key_first_using"
+    private var sPreferences: SharedPreferences? = null
+
+    val preferences: SharedPreferences?
+        get() {
+            if (sPreferences == null)
+                sPreferences = PreferenceManager.getDefaultSharedPreferences(GlobalAppContext.get())
+            return sPreferences
+        }
+
+    val isFirstUsing: Boolean
+        get() {
+            val firstUsing = preferences!!.getBoolean(KEY_FIRST_USING, true)
+            if (firstUsing) {
+                preferences!!.edit().putBoolean(KEY_FIRST_USING, false).apply()
+            }
+            return firstUsing
+        }
+
+    private fun getString(res: Int): String {
+        return GlobalAppContext.getString(res)
+    }
+
+    fun shouldEnableAccessibilityServiceByRoot(): Boolean {
+        return preferences!!.getBoolean(getString(R.string.key_enable_accessibility_service_by_root), false)
+    }
+
+    fun shouldHideLogs(): Boolean {
+        return preferences!!.getBoolean(getString(R.string.key_dont_show_main_activity), false)
+    }
+
+    fun shouldStopAllScriptsWhenVolumeUp(): Boolean {
+        return preferences!!.getBoolean(getString(R.string.key_use_volume_control_running), true)
+    }
+}
diff --git a/inrt/src/main/java/com/stardust/auojs/inrt/SettingsActivity.java b/inrt/src/main/java/com/stardust/auojs/inrt/SettingsActivity.java
deleted file mode 100644
index 195f307e..00000000
--- a/inrt/src/main/java/com/stardust/auojs/inrt/SettingsActivity.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.stardust.auojs.inrt;
-
-import android.os.Bundle;
-import android.preference.Preference;
-import android.preference.PreferenceFragment;
-import android.preference.PreferenceScreen;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
-import android.view.View;
-
-
-/**
- * Created by Stardust on 2017/12/8.
- */
-
-public class SettingsActivity extends AppCompatActivity {
-
-
-    @Override
-    protected void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setupViews();
-    }
-
-    private void setupViews() {
-        setContentView(R.layout.activity_settings);
-        getFragmentManager().beginTransaction().replace(R.id.fragment_setting, new PreferenceFragment()).commit();
-        Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
-        toolbar.setTitle(R.string.text_settings);
-        setSupportActionBar(toolbar);
-        toolbar.setNavigationOnClickListener(v -> finish());
-        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-    }
-
-    public static class PreferenceFragment extends android.preference.PreferenceFragment {
-
-        @Override
-        public void onCreate(@Nullable Bundle savedInstanceState) {
-            super.onCreate(savedInstanceState);
-            addPreferencesFromResource(R.xml.preference);
-        }
-
-        @Override
-        public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {
-            return super.onPreferenceTreeClick(preferenceScreen, preference);
-        }
-    }
-}
diff --git a/inrt/src/main/java/com/stardust/auojs/inrt/SettingsActivity.kt b/inrt/src/main/java/com/stardust/auojs/inrt/SettingsActivity.kt
new file mode 100644
index 00000000..b2fffe43
--- /dev/null
+++ b/inrt/src/main/java/com/stardust/auojs/inrt/SettingsActivity.kt
@@ -0,0 +1,38 @@
+package com.stardust.auojs.inrt
+
+import android.os.Bundle
+import androidx.annotation.Nullable
+import androidx.appcompat.app.AppCompatActivity
+import androidx.appcompat.widget.Toolbar
+
+
+/**
+ * Created by Stardust on 2017/12/8.
+ */
+
+class SettingsActivity : AppCompatActivity() {
+
+
+    override fun onCreate(@Nullable savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setupViews()
+    }
+
+    private fun setupViews() {
+        setContentView(R.layout.activity_settings)
+        fragmentManager.beginTransaction().replace(R.id.fragment_setting, PreferenceFragment()).commit()
+        val toolbar = findViewById<Toolbar>(R.id.toolbar)
+        toolbar.setTitle(R.string.text_settings)
+        setSupportActionBar(toolbar)
+        toolbar.setNavigationOnClickListener { v -> finish() }
+        supportActionBar?.setDisplayHomeAsUpEnabled(true)
+    }
+
+    class PreferenceFragment : android.preference.PreferenceFragment() {
+
+        override fun onCreate(@Nullable savedInstanceState: Bundle?) {
+            super.onCreate(savedInstanceState)
+            addPreferencesFromResource(R.xml.preference)
+        }
+    }
+}
diff --git a/inrt/src/main/java/com/stardust/auojs/inrt/SplashActivity.java b/inrt/src/main/java/com/stardust/auojs/inrt/SplashActivity.java
deleted file mode 100644
index ff6dcc96..00000000
--- a/inrt/src/main/java/com/stardust/auojs/inrt/SplashActivity.java
+++ /dev/null
@@ -1,105 +0,0 @@
-package com.stardust.auojs.inrt;
-
-import android.Manifest;
-import android.content.Intent;
-import android.graphics.Typeface;
-import android.os.Build;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.SystemClock;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.RequiresApi;
-import android.support.v7.app.AppCompatActivity;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import com.stardust.auojs.inrt.autojs.AutoJs;
-import com.stardust.auojs.inrt.launch.GlobalProjectLauncher;
-import com.stardust.autojs.core.image.OpenCVHelper;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import static android.content.pm.PackageManager.PERMISSION_DENIED;
-
-/**
- * Created by Stardust on 2018/2/2.
- */
-
-public class SplashActivity extends AppCompatActivity {
-
-    private static final int PERMISSION_REQUEST_CODE = 11186;
-    private static final long INIT_TIMEOUT = 2500;
-
-    @Override
-    protected void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_splash);
-        TextView slug = findViewById(R.id.slug);
-        slug.setTypeface(Typeface.createFromAsset(getAssets(), "roboto_medium.ttf"));
-        final long millis = SystemClock.uptimeMillis();
-        OpenCVHelper.initIfNeeded(this, () -> {
-            long delay = INIT_TIMEOUT - (SystemClock.uptimeMillis() - millis);
-            if (!Pref.isFirstUsing() || delay <= 0) {
-                main();
-                return;
-            }
-            new Handler().postDelayed(SplashActivity.this::main, delay);
-        });
-
-    }
-
-    private void main() {
-        checkPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE,
-                Manifest.permission.READ_PHONE_STATE);
-    }
-
-
-    private void runScript() {
-        new Thread(() -> {
-            try {
-                GlobalProjectLauncher.getInstance().launch(this);
-            } catch (Exception e) {
-                e.printStackTrace();
-                runOnUiThread(() -> {
-                    Toast.makeText(SplashActivity.this, e.getMessage(), Toast.LENGTH_LONG).show();
-                    startActivity(new Intent(SplashActivity.this, LogActivity.class));
-                    AutoJs.getInstance().getGlobalConsole().printAllStackTrace(e);
-                });
-            }
-        }).start();
-    }
-
-    @Override
-    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
-        runScript();
-    }
-
-    protected void checkPermission(String... permissions) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-            String[] requestPermissions = getRequestPermissions(permissions);
-            if (requestPermissions.length > 0) {
-                requestPermissions(requestPermissions, PERMISSION_REQUEST_CODE);
-            } else {
-                runScript();
-            }
-        } else {
-            runScript();
-        }
-    }
-
-
-    @RequiresApi(api = Build.VERSION_CODES.M)
-    private String[] getRequestPermissions(String[] permissions) {
-        List<String> list = new ArrayList<>();
-        for (String permission : permissions) {
-            if (checkSelfPermission(permission) == PERMISSION_DENIED) {
-                list.add(permission);
-            }
-        }
-        return list.toArray(new String[list.size()]);
-    }
-
-}
-
diff --git a/inrt/src/main/java/com/stardust/auojs/inrt/SplashActivity.kt b/inrt/src/main/java/com/stardust/auojs/inrt/SplashActivity.kt
new file mode 100644
index 00000000..5705cd2f
--- /dev/null
+++ b/inrt/src/main/java/com/stardust/auojs/inrt/SplashActivity.kt
@@ -0,0 +1,98 @@
+package com.stardust.auojs.inrt
+
+import android.Manifest
+import android.content.Intent
+import android.graphics.Typeface
+import android.os.Build
+import android.os.Bundle
+import android.os.Handler
+import androidx.annotation.NonNull
+import androidx.annotation.Nullable
+import androidx.annotation.RequiresApi
+import androidx.appcompat.app.AppCompatActivity
+import android.widget.TextView
+import android.widget.Toast
+
+import com.stardust.auojs.inrt.autojs.AutoJs
+import com.stardust.auojs.inrt.launch.GlobalProjectLauncher
+
+import java.util.ArrayList
+
+import android.content.pm.PackageManager.PERMISSION_DENIED
+
+/**
+ * Created by Stardust on 2018/2/2.
+ */
+
+class SplashActivity : AppCompatActivity() {
+
+    override fun onCreate(@Nullable savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_splash)
+        val slug = findViewById<TextView>(R.id.slug)
+        slug.typeface = Typeface.createFromAsset(assets, "roboto_medium.ttf")
+        if (!Pref.isFirstUsing) {
+            main()
+        } else {
+            Handler().postDelayed({ this@SplashActivity.main() }, INIT_TIMEOUT)
+        }
+    }
+
+    private fun main() {
+        checkPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE,
+                Manifest.permission.READ_PHONE_STATE)
+    }
+
+
+    private fun runScript() {
+        Thread {
+            try {
+                GlobalProjectLauncher.launch(this)
+            } catch (e: Exception) {
+                e.printStackTrace()
+                runOnUiThread {
+                    Toast.makeText(this@SplashActivity, e.message, Toast.LENGTH_LONG).show()
+                    startActivity(Intent(this@SplashActivity, LogActivity::class.java))
+                    AutoJs.instance!!.globalConsole.printAllStackTrace(e)
+                }
+            }
+        }.start()
+    }
+
+    override fun onRequestPermissionsResult(requestCode: Int, @NonNull permissions: Array<String>, @NonNull grantResults: IntArray) {
+        runScript()
+    }
+
+    private fun checkPermission(vararg permissions: String) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            val requestPermissions = getRequestPermissions(permissions)
+            if (requestPermissions.isNotEmpty()) {
+                requestPermissions(requestPermissions, PERMISSION_REQUEST_CODE)
+            } else {
+                runScript()
+            }
+        } else {
+            runScript()
+        }
+    }
+
+
+    @RequiresApi(api = Build.VERSION_CODES.M)
+    private fun getRequestPermissions(permissions: Array<out String>): Array<String> {
+        val list = ArrayList<String>()
+        for (permission in permissions) {
+            if (checkSelfPermission(permission) == PERMISSION_DENIED) {
+                list.add(permission)
+            }
+        }
+        return list.toTypedArray()
+    }
+
+    companion object {
+
+        private const val PERMISSION_REQUEST_CODE = 11186
+        private const val INIT_TIMEOUT: Long = 2500
+    }
+
+}
+
diff --git a/inrt/src/main/java/com/stardust/auojs/inrt/autojs/AccessibilityService.java b/inrt/src/main/java/com/stardust/auojs/inrt/autojs/AccessibilityService.java
deleted file mode 100644
index 007fd70a..00000000
--- a/inrt/src/main/java/com/stardust/auojs/inrt/autojs/AccessibilityService.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.stardust.auojs.inrt.autojs;
-
-import android.accessibilityservice.AccessibilityServiceInfo;
-
-import com.stardust.auojs.inrt.Pref;
-
-/**
- * Created by Stardust on 2017/12/8.
- */
-
-public class AccessibilityService extends com.stardust.view.accessibility.AccessibilityService {
-
-
-    @Override
-    protected void onServiceConnected() {
-        AccessibilityServiceInfo serviceInfo = getServiceInfo();
-        if (Pref.isStableModeEnabled()) {
-            serviceInfo.flags &= ~AccessibilityServiceInfo.FLAG_INCLUDE_NOT_IMPORTANT_VIEWS;
-        } else {
-            serviceInfo.flags |= AccessibilityServiceInfo.FLAG_INCLUDE_NOT_IMPORTANT_VIEWS;
-        }
-        setServiceInfo(serviceInfo);
-        super.onServiceConnected();
-
-    }
-}
diff --git a/inrt/src/main/java/com/stardust/auojs/inrt/autojs/AccessibilityServiceTool.java b/inrt/src/main/java/com/stardust/auojs/inrt/autojs/AccessibilityServiceTool.java
deleted file mode 100644
index f2119adb..00000000
--- a/inrt/src/main/java/com/stardust/auojs/inrt/autojs/AccessibilityServiceTool.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package com.stardust.auojs.inrt.autojs;
-
-import android.accessibilityservice.AccessibilityService;
-import android.content.Context;
-import android.content.Intent;
-import android.provider.Settings;
-import android.text.TextUtils;
-
-import com.stardust.app.GlobalAppContext;
-import com.stardust.auojs.inrt.App;
-import com.stardust.autojs.core.util.ProcessShell;
-
-import java.util.Locale;
-
-/**
- * Created by Stardust on 2017/7/1.
- */
-
-public class AccessibilityServiceTool {
-
-    private static final String cmd = "enabled=$(settings get secure enabled_accessibility_services)\n" +
-            "pkg=%s\n" +
-            "if [[ $enabled == *$pkg* ]]\n" +
-            "then\n" +
-            "echo already_enabled\n" +
-            "else\n" +
-            "enabled=$pkg:$enabled\n" +
-            "settings put secure enabled_accessibility_services $enabled\n" +
-            "fi";
-
-    public static boolean enableAccessibilityServiceByRoot(Context context, Class<? extends AccessibilityService> accessibilityService) {
-        String serviceName = context.getPackageName() + "/" + accessibilityService.getName();
-        try {
-            return TextUtils.isEmpty(ProcessShell.execCommand(String.format(Locale.getDefault(), cmd, serviceName), true).error);
-        } catch (Exception ignored) {
-            return false;
-        }
-    }
-
-    public static boolean enableAccessibilityServiceByRootAndWaitFor(Context context, long timeOut) {
-        if (enableAccessibilityServiceByRoot(context, com.stardust.view.accessibility.AccessibilityService.class)) {
-            com.stardust.view.accessibility.AccessibilityService.waitForEnabled(timeOut);
-            return true;
-        }
-        return false;
-    }
-
-    public static void goToAccessibilitySetting() {
-        GlobalAppContext.get().startActivity(new Intent(Settings.ACTION_ACCESSIBILITY_SETTINGS).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
-    }
-
-}
diff --git a/inrt/src/main/java/com/stardust/auojs/inrt/autojs/AccessibilityServiceTool.kt b/inrt/src/main/java/com/stardust/auojs/inrt/autojs/AccessibilityServiceTool.kt
new file mode 100644
index 00000000..a18ad96d
--- /dev/null
+++ b/inrt/src/main/java/com/stardust/auojs/inrt/autojs/AccessibilityServiceTool.kt
@@ -0,0 +1,53 @@
+package com.stardust.auojs.inrt.autojs
+
+import android.accessibilityservice.AccessibilityService
+import android.content.Context
+import android.content.Intent
+import android.provider.Settings
+import android.text.TextUtils
+
+import com.stardust.app.GlobalAppContext
+import com.stardust.auojs.inrt.App
+import com.stardust.autojs.core.util.ProcessShell
+
+import java.util.Locale
+
+/**
+ * Created by Stardust on 2017/7/1.
+ */
+
+object AccessibilityServiceTool {
+
+    private val cmd = "enabled=$(settings get secure enabled_accessibility_services)\n" +
+            "pkg=%s\n" +
+            "if [[ \$enabled == *\$pkg* ]]\n" +
+            "then\n" +
+            "echo already_enabled\n" +
+            "else\n" +
+            "enabled=\$pkg:\$enabled\n" +
+            "settings put secure enabled_accessibility_services \$enabled\n" +
+            "fi"
+
+    fun enableAccessibilityServiceByRoot(context: Context, accessibilityService: Class<out AccessibilityService>): Boolean {
+        val serviceName = context.packageName + "/" + accessibilityService.name
+        return try {
+            TextUtils.isEmpty(ProcessShell.execCommand(String.format(Locale.getDefault(), cmd, serviceName), true).error)
+        } catch (ignored: Exception) {
+            false
+        }
+
+    }
+
+    fun enableAccessibilityServiceByRootAndWaitFor(context: Context, timeOut: Long): Boolean {
+        if (enableAccessibilityServiceByRoot(context, com.stardust.view.accessibility.AccessibilityService::class.java)) {
+            com.stardust.view.accessibility.AccessibilityService.waitForEnabled(timeOut)
+            return true
+        }
+        return false
+    }
+
+    fun goToAccessibilitySetting() {
+        GlobalAppContext.get().startActivity(Intent(Settings.ACTION_ACCESSIBILITY_SETTINGS).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK))
+    }
+
+}
diff --git a/inrt/src/main/java/com/stardust/auojs/inrt/autojs/AutoJs.java b/inrt/src/main/java/com/stardust/auojs/inrt/autojs/AutoJs.java
deleted file mode 100644
index 08095089..00000000
--- a/inrt/src/main/java/com/stardust/auojs/inrt/autojs/AutoJs.java
+++ /dev/null
@@ -1,96 +0,0 @@
-package com.stardust.auojs.inrt.autojs;
-
-import android.app.Application;
-import android.content.Context;
-
-import com.stardust.app.GlobalAppContext;
-import com.stardust.auojs.inrt.App;
-import com.stardust.auojs.inrt.LogActivity;
-import com.stardust.auojs.inrt.Pref;
-import com.stardust.auojs.inrt.R;
-import com.stardust.auojs.inrt.SettingsActivity;
-import com.stardust.autojs.runtime.ScriptRuntime;
-import com.stardust.autojs.runtime.exception.ScriptException;
-import com.stardust.autojs.runtime.exception.ScriptInterruptedException;
-import com.stardust.view.accessibility.AccessibilityService;
-import com.stardust.view.accessibility.AccessibilityServiceUtils;
-
-
-/**
- * Created by Stardust on 2017/4/2.
- */
-
-public class AutoJs extends com.stardust.autojs.AutoJs {
-
-    private static AutoJs instance;
-
-    public static AutoJs getInstance() {
-        return instance;
-    }
-
-    public static void initInstance(Application application) {
-        instance = new AutoJs(application);
-    }
-
-    private AutoJs(Application application) {
-        super(application);
-        getScriptEngineService().registerGlobalScriptExecutionListener(new ScriptExecutionGlobalListener());
-    }
-
-
-    @Override
-    public void ensureAccessibilityServiceEnabled() {
-        if (AccessibilityService.getInstance() != null) {
-            return;
-        }
-        String errorMessage = null;
-        if (AccessibilityServiceUtils.isAccessibilityServiceEnabled(getApplication(), AccessibilityService.class)) {
-            errorMessage = GlobalAppContext.getString(R.string.text_auto_operate_service_enabled_but_not_running);
-        } else {
-            if (Pref.shouldEnableAccessibilityServiceByRoot()) {
-                if (!AccessibilityServiceTool.enableAccessibilityServiceByRootAndWaitFor(getApplication(), 2000)) {
-                    errorMessage = GlobalAppContext.getString(R.string.text_enable_accessibility_service_by_root_timeout);
-                }
-            } else {
-                errorMessage = GlobalAppContext.getString(R.string.text_no_accessibility_permission);
-            }
-        }
-        if (errorMessage != null) {
-            AccessibilityServiceTool.goToAccessibilitySetting();
-            throw new ScriptException(errorMessage);
-        }
-    }
-
-    @Override
-    public void waitForAccessibilityServiceEnabled() {
-        if (AccessibilityService.getInstance() != null) {
-            return;
-        }
-        String errorMessage = null;
-        if (AccessibilityServiceUtils.isAccessibilityServiceEnabled(getApplication(), AccessibilityService.class)) {
-            errorMessage = GlobalAppContext.getString(R.string.text_auto_operate_service_enabled_but_not_running);
-        } else {
-            if (Pref.shouldEnableAccessibilityServiceByRoot()) {
-                if (!AccessibilityServiceTool.enableAccessibilityServiceByRootAndWaitFor(getApplication(), 2000)) {
-                    errorMessage = GlobalAppContext.getString(R.string.text_enable_accessibility_service_by_root_timeout);
-                }
-            } else {
-                errorMessage = GlobalAppContext.getString(R.string.text_no_accessibility_permission);
-            }
-        }
-        if (errorMessage != null) {
-            AccessibilityServiceTool.goToAccessibilitySetting();
-            if (!AccessibilityService.waitForEnabled(-1)) {
-                throw new ScriptInterruptedException();
-            }
-        }
-    }
-
-    @Override
-    protected ScriptRuntime createRuntime() {
-        ScriptRuntime runtime = super.createRuntime();
-        runtime.putProperty("class.settings", SettingsActivity.class);
-        runtime.putProperty("class.console", LogActivity.class);
-        return runtime;
-    }
-}
diff --git a/inrt/src/main/java/com/stardust/auojs/inrt/autojs/AutoJs.kt b/inrt/src/main/java/com/stardust/auojs/inrt/autojs/AutoJs.kt
new file mode 100644
index 00000000..f2bd362e
--- /dev/null
+++ b/inrt/src/main/java/com/stardust/auojs/inrt/autojs/AutoJs.kt
@@ -0,0 +1,108 @@
+package com.stardust.auojs.inrt.autojs
+
+import android.annotation.SuppressLint
+import android.app.Application
+import android.content.Context
+import com.stardust.app.GlobalAppContext
+import com.stardust.auojs.inrt.LogActivity
+import com.stardust.auojs.inrt.Pref
+import com.stardust.auojs.inrt.R
+import com.stardust.auojs.inrt.SettingsActivity
+import com.stardust.autojs.runtime.ScriptRuntime
+import com.stardust.autojs.runtime.api.AppUtils
+import com.stardust.autojs.runtime.exception.ScriptException
+import com.stardust.autojs.runtime.exception.ScriptInterruptedException
+import com.stardust.autojs.script.JavaScriptSource
+import com.stardust.view.accessibility.AccessibilityService
+import com.stardust.view.accessibility.AccessibilityServiceUtils
+import java.lang.IllegalStateException
+
+
+/**
+ * Created by Stardust on 2017/4/2.
+ */
+
+class AutoJs private constructor(application: Application) : com.stardust.autojs.AutoJs(application) {
+
+    init {
+        scriptEngineService.registerGlobalScriptExecutionListener(ScriptExecutionGlobalListener())
+    }
+
+    override fun createAppUtils(context: Context): AppUtils {
+        return AppUtils(context, context.packageName + ".fileprovider")
+    }
+
+
+    override fun ensureAccessibilityServiceEnabled() {
+        if (AccessibilityService.instance != null) {
+            return
+        }
+        var errorMessage: String? = null
+        if (AccessibilityServiceUtils.isAccessibilityServiceEnabled(application, AccessibilityService::class.java)) {
+            errorMessage = GlobalAppContext.getString(R.string.text_auto_operate_service_enabled_but_not_running)
+        } else {
+            if (Pref.shouldEnableAccessibilityServiceByRoot()) {
+                if (!AccessibilityServiceTool.enableAccessibilityServiceByRootAndWaitFor(application, 2000)) {
+                    errorMessage = GlobalAppContext.getString(R.string.text_enable_accessibility_service_by_root_timeout)
+                }
+            } else {
+                errorMessage = GlobalAppContext.getString(R.string.text_no_accessibility_permission)
+            }
+        }
+        if (errorMessage != null) {
+            AccessibilityServiceTool.goToAccessibilitySetting()
+            throw ScriptException(errorMessage)
+        }
+    }
+
+    override fun waitForAccessibilityServiceEnabled() {
+        if (AccessibilityService.instance != null) {
+            return
+        }
+        var errorMessage: String? = null
+        if (AccessibilityServiceUtils.isAccessibilityServiceEnabled(application, AccessibilityService::class.java)) {
+            errorMessage = GlobalAppContext.getString(R.string.text_auto_operate_service_enabled_but_not_running)
+        } else {
+            if (Pref.shouldEnableAccessibilityServiceByRoot()) {
+                if (!AccessibilityServiceTool.enableAccessibilityServiceByRootAndWaitFor(application, 2000)) {
+                    errorMessage = GlobalAppContext.getString(R.string.text_enable_accessibility_service_by_root_timeout)
+                }
+            } else {
+                errorMessage = GlobalAppContext.getString(R.string.text_no_accessibility_permission)
+            }
+        }
+        if (errorMessage != null) {
+            AccessibilityServiceTool.goToAccessibilitySetting()
+            if (!AccessibilityService.waitForEnabled(-1)) {
+                throw ScriptInterruptedException()
+            }
+        }
+    }
+
+    override fun initScriptEngineManager() {
+        super.initScriptEngineManager()
+        scriptEngineManager.registerEngine(JavaScriptSource.ENGINE) {
+            val engine = XJavaScriptEngine(application)
+            engine.runtime = createRuntime()
+            engine
+        }
+    }
+
+    override fun createRuntime(): ScriptRuntime {
+        val runtime = super.createRuntime()
+        runtime.putProperty("class.settings", SettingsActivity::class.java)
+        runtime.putProperty("class.console", LogActivity::class.java)
+        return runtime
+    }
+
+    companion object {
+
+        @SuppressLint("StaticFieldLeak")
+        lateinit var instance: AutoJs
+            private set
+
+        fun initInstance(application: Application) {
+            instance = AutoJs(application)
+        }
+    }
+}
diff --git a/inrt/src/main/java/com/stardust/auojs/inrt/autojs/GlobalKeyObserver.java b/inrt/src/main/java/com/stardust/auojs/inrt/autojs/GlobalKeyObserver.java
deleted file mode 100644
index 14bff7f6..00000000
--- a/inrt/src/main/java/com/stardust/auojs/inrt/autojs/GlobalKeyObserver.java
+++ /dev/null
@@ -1,93 +0,0 @@
-package com.stardust.auojs.inrt.autojs;
-
-import android.util.Log;
-import android.view.KeyEvent;
-
-import com.stardust.app.GlobalAppContext;
-import com.stardust.auojs.inrt.Pref;
-import com.stardust.autojs.core.inputevent.InputEventObserver;
-import com.stardust.autojs.core.inputevent.ShellKeyObserver;
-import com.stardust.view.accessibility.AccessibilityService;
-import com.stardust.view.accessibility.OnKeyListener;
-
-/**
- * Created by Stardust on 2017/8/14.
- */
-
-public class GlobalKeyObserver implements OnKeyListener, ShellKeyObserver.KeyListener {
-
-
-    private static final String LOG_TAG = "GlobalKeyObserver";
-    private static GlobalKeyObserver sSingleton = new GlobalKeyObserver();
-    private boolean mVolumeDownFromShell, mVolumeDownFromAccessibility;
-    private boolean mVolumeUpFromShell, mVolumeUpFromAccessibility;
-
-    GlobalKeyObserver() {
-        AccessibilityService.getStickOnKeyObserver()
-                .addListener(this);
-        ShellKeyObserver observer = new ShellKeyObserver();
-        observer.setKeyListener(this);
-        InputEventObserver.getGlobal(GlobalAppContext.get()).addListener(observer);
-    }
-
-    public static void init() {
-        //do nothing
-    }
-
-    public void onVolumeUp() {
-        Log.d(LOG_TAG, "onVolumeUp at " + System.currentTimeMillis());
-        if (Pref.shouldStopAllScriptsWhenVolumeUp()) {
-            AutoJs.getInstance().getScriptEngineService().stopAllAndToast();
-        }
-    }
-
-    @Override
-    public void onKeyEvent(int keyCode, KeyEvent event) {
-        if (event.getAction() != KeyEvent.ACTION_UP)
-            return;
-        if (keyCode == KeyEvent.KEYCODE_VOLUME_DOWN) {
-            if (mVolumeDownFromShell) {
-                mVolumeDownFromShell = false;
-                return;
-            }
-            mVolumeUpFromAccessibility = true;
-            onVolumeDown();
-        } else if (keyCode == KeyEvent.KEYCODE_VOLUME_UP) {
-            if (mVolumeUpFromShell) {
-                mVolumeUpFromShell = false;
-                return;
-            }
-            mVolumeUpFromAccessibility = true;
-            onVolumeUp();
-        }
-    }
-
-    public void onVolumeDown() {
-
-    }
-
-
-    @Override
-    public void onKeyDown(String keyName) {
-
-    }
-
-    @Override
-    public void onKeyUp(String keyName) {
-        if ("KEY_VOLUMEUP".equals(keyName)) {
-            if (mVolumeUpFromAccessibility) {
-                mVolumeUpFromAccessibility = false;
-                return;
-            }
-            mVolumeUpFromShell = true;
-            onVolumeUp();
-        } else if ("KEY_VOLUMEDOWN".equals(keyName)) {
-            if (mVolumeDownFromAccessibility) {
-                mVolumeDownFromAccessibility = false;
-                return;
-            }
-            mVolumeDownFromShell = true;
-            onVolumeDown();
-        }
-    }
-}
diff --git a/inrt/src/main/java/com/stardust/auojs/inrt/autojs/GlobalKeyObserver.kt b/inrt/src/main/java/com/stardust/auojs/inrt/autojs/GlobalKeyObserver.kt
new file mode 100644
index 00000000..975c2407
--- /dev/null
+++ b/inrt/src/main/java/com/stardust/auojs/inrt/autojs/GlobalKeyObserver.kt
@@ -0,0 +1,95 @@
+package com.stardust.auojs.inrt.autojs
+
+import android.util.Log
+import android.view.KeyEvent
+
+import com.stardust.app.GlobalAppContext
+import com.stardust.auojs.inrt.Pref
+import com.stardust.autojs.core.inputevent.InputEventObserver
+import com.stardust.autojs.core.inputevent.ShellKeyObserver
+import com.stardust.view.accessibility.AccessibilityService
+import com.stardust.view.accessibility.OnKeyListener
+
+/**
+ * Created by Stardust on 2017/8/14.
+ */
+
+class GlobalKeyObserver internal constructor() : OnKeyListener, ShellKeyObserver.KeyListener {
+    private var mVolumeDownFromShell: Boolean = false
+    private var mVolumeDownFromAccessibility: Boolean = false
+    private var mVolumeUpFromShell: Boolean = false
+    private var mVolumeUpFromAccessibility: Boolean = false
+
+    init {
+        AccessibilityService.stickOnKeyObserver
+                .addListener(this)
+        val observer = ShellKeyObserver()
+        observer.setKeyListener(this)
+        InputEventObserver.getGlobal(GlobalAppContext.get()).addListener(observer)
+    }
+
+    fun onVolumeUp() {
+        Log.d(LOG_TAG, "onVolumeUp at " + System.currentTimeMillis())
+        if (Pref.shouldStopAllScriptsWhenVolumeUp()) {
+            AutoJs.instance!!.scriptEngineService.stopAllAndToast()
+        }
+    }
+
+    override fun onKeyEvent(keyCode: Int, event: KeyEvent) {
+        if (event.action != KeyEvent.ACTION_UP)
+            return
+        if (keyCode == KeyEvent.KEYCODE_VOLUME_DOWN) {
+            if (mVolumeDownFromShell) {
+                mVolumeDownFromShell = false
+                return
+            }
+            mVolumeUpFromAccessibility = true
+            onVolumeDown()
+        } else if (keyCode == KeyEvent.KEYCODE_VOLUME_UP) {
+            if (mVolumeUpFromShell) {
+                mVolumeUpFromShell = false
+                return
+            }
+            mVolumeUpFromAccessibility = true
+            onVolumeUp()
+        }
+    }
+
+    fun onVolumeDown() {
+
+    }
+
+
+    override fun onKeyDown(keyName: String) {
+
+    }
+
+    override fun onKeyUp(keyName: String) {
+        if ("KEY_VOLUMEUP" == keyName) {
+            if (mVolumeUpFromAccessibility) {
+                mVolumeUpFromAccessibility = false
+                return
+            }
+            mVolumeUpFromShell = true
+            onVolumeUp()
+        } else if ("KEY_VOLUMEDOWN" == keyName) {
+            if (mVolumeDownFromAccessibility) {
+                mVolumeDownFromAccessibility = false
+                return
+            }
+            mVolumeDownFromShell = true
+            onVolumeDown()
+        }
+    }
+
+    companion object {
+
+
+        private val LOG_TAG = "GlobalKeyObserver"
+        private val sSingleton = GlobalKeyObserver()
+
+        fun init() {
+            //do nothing
+        }
+    }
+}
diff --git a/inrt/src/main/java/com/stardust/auojs/inrt/autojs/ScriptExecutionGlobalListener.java b/inrt/src/main/java/com/stardust/auojs/inrt/autojs/ScriptExecutionGlobalListener.java
deleted file mode 100644
index c503e57d..00000000
--- a/inrt/src/main/java/com/stardust/auojs/inrt/autojs/ScriptExecutionGlobalListener.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.stardust.auojs.inrt.autojs;
-
-import com.stardust.app.GlobalAppContext;
-import com.stardust.auojs.inrt.R;
-import com.stardust.autojs.execution.ScriptExecution;
-import com.stardust.autojs.execution.ScriptExecutionListener;
-
-/**
- * Created by Stardust on 2017/5/3.
- */
-
-public class ScriptExecutionGlobalListener implements ScriptExecutionListener {
-    private static final String ENGINE_TAG_START_TIME = "org.autojs.autojs.autojs.Goodbye, World";
-
-    @Override
-    public void onStart(ScriptExecution execution) {
-        execution.getEngine().setTag(ENGINE_TAG_START_TIME, System.currentTimeMillis());
-    }
-
-    @Override
-    public void onSuccess(ScriptExecution execution, Object result) {
-        onFinish(execution);
-    }
-
-    private void onFinish(ScriptExecution execution) {
-        Long millis = (Long) execution.getEngine().getTag(ENGINE_TAG_START_TIME);
-        if (millis == null)
-            return;
-        double seconds = (System.currentTimeMillis() - millis) / 1000.0;
-        AutoJs.getInstance().getScriptEngineService().getGlobalConsole()
-                .verbose(GlobalAppContext.getString(R.string.text_execution_finished), execution.getSource().toString(), seconds);
-    }
-
-    @Override
-    public void onException(ScriptExecution execution, Exception e) {
-        onFinish(execution);
-    }
-
-}
diff --git a/inrt/src/main/java/com/stardust/auojs/inrt/autojs/ScriptExecutionGlobalListener.kt b/inrt/src/main/java/com/stardust/auojs/inrt/autojs/ScriptExecutionGlobalListener.kt
new file mode 100644
index 00000000..753fd97e
--- /dev/null
+++ b/inrt/src/main/java/com/stardust/auojs/inrt/autojs/ScriptExecutionGlobalListener.kt
@@ -0,0 +1,37 @@
+package com.stardust.auojs.inrt.autojs
+
+import com.stardust.app.GlobalAppContext
+import com.stardust.auojs.inrt.R
+import com.stardust.autojs.execution.ScriptExecution
+import com.stardust.autojs.execution.ScriptExecutionListener
+
+/**
+ * Created by Stardust on 2017/5/3.
+ */
+
+class ScriptExecutionGlobalListener : ScriptExecutionListener {
+
+    override fun onStart(execution: ScriptExecution) {
+        execution.engine.setTag(ENGINE_TAG_START_TIME, System.currentTimeMillis())
+    }
+
+    override fun onSuccess(execution: ScriptExecution, result: Any?) {
+        onFinish(execution)
+    }
+
+    private fun onFinish(execution: ScriptExecution) {
+        val millis = execution.engine.getTag(ENGINE_TAG_START_TIME) as Long? ?: return
+        val seconds = (System.currentTimeMillis() - millis) / 1000.0
+        AutoJs.instance.scriptEngineService.globalConsole
+                .verbose(GlobalAppContext.getString(R.string.text_execution_finished), execution.source.toString(), seconds)
+    }
+
+    override fun onException(execution: ScriptExecution, e: Throwable) {
+        onFinish(execution)
+    }
+
+    companion object {
+        private const val ENGINE_TAG_START_TIME = "start_time"
+    }
+
+}
diff --git a/inrt/src/main/java/com/stardust/auojs/inrt/autojs/XJavaScriptEngine.kt b/inrt/src/main/java/com/stardust/auojs/inrt/autojs/XJavaScriptEngine.kt
new file mode 100644
index 00000000..75e95481
--- /dev/null
+++ b/inrt/src/main/java/com/stardust/auojs/inrt/autojs/XJavaScriptEngine.kt
@@ -0,0 +1,44 @@
+package com.stardust.auojs.inrt.autojs
+
+import android.content.Context
+import com.stardust.autojs.engine.LoopBasedJavaScriptEngine
+import com.stardust.autojs.engine.encryption.ScriptEncryption
+import com.stardust.autojs.script.EncryptedScriptFileHeader
+import com.stardust.autojs.script.JavaScriptFileSource
+import com.stardust.autojs.script.ScriptSource
+import com.stardust.autojs.script.StringScriptSource
+import com.stardust.pio.PFiles
+import java.io.File
+import java.security.GeneralSecurityException
+
+class XJavaScriptEngine(context: Context) : LoopBasedJavaScriptEngine(context) {
+
+
+    override fun execute(source: ScriptSource, callback: ExecuteCallback?) {
+        if (source is JavaScriptFileSource) {
+            try {
+                if (execute(source.file)) {
+                    return
+                }
+            } catch (e: Throwable) {
+                e.printStackTrace()
+                return
+            }
+        }
+        super.execute(source, callback)
+    }
+
+    private fun execute(file: File): Boolean {
+        val bytes = PFiles.readBytes(file.path)
+        if (!EncryptedScriptFileHeader.isValidFile(bytes)) {
+            return false
+        }
+        try {
+            super.execute(StringScriptSource(file.name, String(ScriptEncryption.decrypt(bytes, EncryptedScriptFileHeader.BLOCK_SIZE))))
+        } catch (e: GeneralSecurityException) {
+            e.printStackTrace()
+        }
+        return true
+    }
+
+}
\ No newline at end of file
diff --git a/inrt/src/main/java/com/stardust/auojs/inrt/launch/AssetsProjectLauncher.java b/inrt/src/main/java/com/stardust/auojs/inrt/launch/AssetsProjectLauncher.java
deleted file mode 100644
index 1ee45672..00000000
--- a/inrt/src/main/java/com/stardust/auojs/inrt/launch/AssetsProjectLauncher.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package com.stardust.auojs.inrt.launch;
-
-import android.app.Activity;
-import android.content.Context;
-import android.content.Intent;
-import android.os.Handler;
-import android.os.Looper;
-import android.text.TextUtils;
-
-import com.stardust.auojs.inrt.BuildConfig;
-import com.stardust.auojs.inrt.LogActivity;
-import com.stardust.auojs.inrt.Pref;
-import com.stardust.auojs.inrt.autojs.AutoJs;
-import com.stardust.autojs.ScriptEngineService;
-import com.stardust.autojs.execution.ExecutionConfig;
-import com.stardust.autojs.execution.ScriptExecution;
-import com.stardust.autojs.project.ProjectConfig;
-import com.stardust.autojs.script.JavaScriptFileSource;
-import com.stardust.pio.PFiles;
-import com.stardust.pio.UncheckedIOException;
-
-import java.io.File;
-import java.io.IOException;
-
-/**
- * Created by Stardust on 2018/1/24.
- */
-
-public class AssetsProjectLauncher {
-
-    private String mAssetsProjectDir;
-    private String mProjectDir;
-    private File mMainScriptFile;
-    private ProjectConfig mProjectConfig;
-    private Context mActivity;
-    private Handler mHandler;
-    private ScriptExecution mScriptExecution;
-
-    public AssetsProjectLauncher(String projectDir, Context context) {
-        mAssetsProjectDir = projectDir;
-        mActivity = context;
-        mProjectDir = new File(context.getFilesDir(), "project/").getPath();
-        mProjectConfig = ProjectConfig.fromAssets(context, ProjectConfig.configFileOfDir(mAssetsProjectDir));
-        mMainScriptFile = new File(mProjectDir, mProjectConfig.getMainScriptFile());
-        mHandler = new Handler(Looper.getMainLooper());
-        prepare();
-    }
-
-    public void launch(Activity activity) {
-        //如果需要隐藏日志界面，则直接运行脚本
-        if (mProjectConfig.getLaunchConfig().shouldHideLogs() || Pref.shouldHideLogs()) {
-            activity.finish();
-            runScript();
-        } else {
-            //如果不隐藏日志界面
-            //如果当前已经是日志界面则直接运行脚本
-            if (activity instanceof LogActivity) {
-                runScript();
-            } else {
-                //否则显示日志界面并在日志界面中运行脚本
-                mHandler.post(() -> {
-                    activity.startActivity(new Intent(mActivity, LogActivity.class)
-                            .putExtra(LogActivity.EXTRA_LAUNCH_SCRIPT, true));
-                    activity.finish();
-                });
-            }
-        }
-    }
-
-    private void runScript() {
-        if (mScriptExecution != null && mScriptExecution.getEngine() != null &&
-                !mScriptExecution.getEngine().isDestroyed()) {
-            return;
-        }
-        try {
-            JavaScriptFileSource source = new JavaScriptFileSource("main", mMainScriptFile);
-            mScriptExecution = AutoJs.getInstance().getScriptEngineService().execute(source, new ExecutionConfig()
-                    .executePath(mProjectDir));
-        } catch (Exception e) {
-            AutoJs.getInstance().getGlobalConsole().error(e);
-        }
-    }
-
-    private void prepare() {
-        String projectConfigPath = PFiles.join(mProjectDir, ProjectConfig.CONFIG_FILE_NAME);
-        ProjectConfig projectConfig = ProjectConfig.fromFile(projectConfigPath);
-        if (!BuildConfig.DEBUG && projectConfig != null &&
-                TextUtils.equals(projectConfig.getBuildInfo().getBuildId(), mProjectConfig.getBuildInfo().getBuildId())) {
-            return;
-        }
-        PFiles.deleteRecursively(new File(mProjectDir));
-        try {
-            PFiles.copyAssetDir(mActivity, mAssetsProjectDir, mProjectDir, null);
-        } catch (IOException e) {
-            throw new UncheckedIOException(e);
-        }
-    }
-
-}
diff --git a/inrt/src/main/java/com/stardust/auojs/inrt/launch/AssetsProjectLauncher.kt b/inrt/src/main/java/com/stardust/auojs/inrt/launch/AssetsProjectLauncher.kt
new file mode 100644
index 00000000..5adbbe31
--- /dev/null
+++ b/inrt/src/main/java/com/stardust/auojs/inrt/launch/AssetsProjectLauncher.kt
@@ -0,0 +1,117 @@
+package com.stardust.auojs.inrt.launch
+
+import android.app.Activity
+import android.content.Context
+import android.content.Intent
+import android.os.Handler
+import android.os.Looper
+import android.text.TextUtils
+
+import com.stardust.auojs.inrt.BuildConfig
+import com.stardust.auojs.inrt.LogActivity
+import com.stardust.auojs.inrt.Pref
+import com.stardust.auojs.inrt.autojs.AutoJs
+import com.stardust.autojs.engine.encryption.ScriptEncryption
+import com.stardust.autojs.execution.ExecutionConfig
+import com.stardust.autojs.execution.ScriptExecution
+import com.stardust.autojs.project.ProjectConfig
+import com.stardust.autojs.script.JavaScriptFileSource
+import com.stardust.autojs.script.JavaScriptSource
+import com.stardust.autojs.script.ScriptSource
+import com.stardust.pio.PFiles
+import com.stardust.pio.UncheckedIOException
+import com.stardust.util.MD5
+
+import java.io.File
+import java.io.IOException
+import java.lang.reflect.Field
+
+/**
+ * Created by Stardust on 2018/1/24.
+ */
+
+open class AssetsProjectLauncher(private val mAssetsProjectDir: String, private val mActivity: Context) {
+    private val mProjectDir: String = File(mActivity.filesDir, "project/").path
+    private val mProjectConfig: ProjectConfig = ProjectConfig.fromAssets(mActivity, ProjectConfig.configFileOfDir(mAssetsProjectDir))
+    private val mMainScriptFile: File = File(mProjectDir, mProjectConfig.mainScriptFile)
+    private val mHandler: Handler = Handler(Looper.getMainLooper())
+    private var mScriptExecution: ScriptExecution? = null
+
+    init {
+        prepare()
+    }
+
+    fun launch(activity: Activity) {
+        //如果需要隐藏日志界面，则直接运行脚本
+        if (mProjectConfig.launchConfig.shouldHideLogs() || Pref.shouldHideLogs()) {
+            runScript(activity)
+        } else {
+            //如果不隐藏日志界面
+            //如果当前已经是日志界面则直接运行脚本
+            if (activity is LogActivity) {
+                runScript(null)
+            } else {
+                //否则显示日志界面并在日志界面中运行脚本
+                mHandler.post {
+                    activity.startActivity(Intent(mActivity, LogActivity::class.java)
+                            .putExtra(LogActivity.EXTRA_LAUNCH_SCRIPT, true))
+                    activity.finish()
+                }
+            }
+        }
+    }
+
+    private fun runScript(activity: Activity?) {
+        if (mScriptExecution != null && mScriptExecution!!.engine != null &&
+                !mScriptExecution!!.engine.isDestroyed) {
+            return
+        }
+        try {
+            val source = JavaScriptFileSource("main", mMainScriptFile)
+            val config = ExecutionConfig(workingDirectory = mProjectDir)
+            if (source.executionMode and JavaScriptSource.EXECUTION_MODE_UI != 0) {
+                config.intentFlags = Intent.FLAG_ACTIVITY_CLEAR_TASK or Intent.FLAG_ACTIVITY_TASK_ON_HOME
+            } else {
+                activity?.finish()
+            }
+            mScriptExecution = AutoJs.instance.scriptEngineService.execute(source, config)
+        } catch (e: Exception) {
+            AutoJs.instance.globalConsole.error(e)
+        }
+
+    }
+
+    private fun prepare() {
+        val projectConfigPath = PFiles.join(mProjectDir, ProjectConfig.CONFIG_FILE_NAME)
+        val projectConfig = ProjectConfig.fromFile(projectConfigPath)
+        if (!BuildConfig.DEBUG && projectConfig != null &&
+                TextUtils.equals(projectConfig.buildInfo.buildId, mProjectConfig.buildInfo.buildId)) {
+            initKey(projectConfig)
+            return
+        }
+        initKey(mProjectConfig)
+        PFiles.deleteRecursively(File(mProjectDir))
+        try {
+            PFiles.copyAssetDir(mActivity.assets, mAssetsProjectDir, mProjectDir, null)
+        } catch (e: IOException) {
+            throw UncheckedIOException(e)
+        }
+    }
+
+    private fun initKey(projectConfig: ProjectConfig) {
+        val key = MD5.md5(projectConfig.packageName + projectConfig.versionName + projectConfig.mainScriptFile)
+        val vec = MD5.md5(projectConfig.buildInfo.buildId + projectConfig.name).substring(0, 16)
+        try {
+            val fieldKey = ScriptEncryption::class.java.getDeclaredField("mKey")
+            fieldKey.isAccessible = true
+            fieldKey.set(null, key)
+            val fieldVector = ScriptEncryption::class.java.getDeclaredField("mInitVector")
+            fieldVector.isAccessible = true
+            fieldVector.set(null, vec)
+        } catch (e: Exception) {
+            e.printStackTrace()
+        }
+
+    }
+
+}
diff --git a/inrt/src/main/java/com/stardust/auojs/inrt/launch/GlobalProjectLauncher.java b/inrt/src/main/java/com/stardust/auojs/inrt/launch/GlobalProjectLauncher.java
deleted file mode 100644
index ea8e5297..00000000
--- a/inrt/src/main/java/com/stardust/auojs/inrt/launch/GlobalProjectLauncher.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.stardust.auojs.inrt.launch;
-
-import android.app.Activity;
-import android.content.Context;
-
-import com.stardust.app.GlobalAppContext;
-import com.stardust.auojs.inrt.App;
-
-/**
- * Created by Stardust on 2018/3/21.
- */
-
-public class GlobalProjectLauncher extends AssetsProjectLauncher {
-
-    private static GlobalProjectLauncher sInstance;
-
-    public static GlobalProjectLauncher getInstance() {
-        if (sInstance == null)
-            sInstance = new GlobalProjectLauncher(GlobalAppContext.get());
-        return sInstance;
-    }
-
-    GlobalProjectLauncher(Context context) {
-        super("project", context);
-    }
-}
diff --git a/inrt/src/main/java/com/stardust/auojs/inrt/launch/GlobalProjectLauncher.kt b/inrt/src/main/java/com/stardust/auojs/inrt/launch/GlobalProjectLauncher.kt
new file mode 100644
index 00000000..20742c8c
--- /dev/null
+++ b/inrt/src/main/java/com/stardust/auojs/inrt/launch/GlobalProjectLauncher.kt
@@ -0,0 +1,11 @@
+package com.stardust.auojs.inrt.launch
+
+import android.annotation.SuppressLint
+import com.stardust.app.GlobalAppContext
+
+/**
+ * Created by Stardust on 2018/3/21.
+ */
+
+@SuppressLint("StaticFieldLeak")
+object GlobalProjectLauncher: AssetsProjectLauncher("project", GlobalAppContext.get())
diff --git a/inrt/src/main/res/layout/activity_main.xml b/inrt/src/main/res/layout/activity_main.xml
index b05fcb7e..69dfffe7 100644
--- a/inrt/src/main/res/layout/activity_main.xml
+++ b/inrt/src/main/res/layout/activity_main.xml
@@ -8,21 +8,23 @@
               android:orientation="vertical">
 
 
-    <android.support.design.widget.AppBarLayout
+    <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:theme="@style/AppTheme.AppBarOverlay">
 
-        <android.support.v7.widget.Toolbar
+        <androidx.appcompat.widget.Toolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             app:popupTheme="@style/AppTheme.PopupOverlay"/>
 
-    </android.support.design.widget.AppBarLayout>
+    </com.google.android.material.appbar.AppBarLayout>
 
     <com.stardust.autojs.core.console.ConsoleView
         android:id="@+id/console"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"/>
+        android:layout_height="match_parent"
+        app:color_debug="#cc000000"
+        app:color_verbose="#dfc0c0c0"/>
 </LinearLayout>
\ No newline at end of file
diff --git a/inrt/src/main/res/layout/activity_settings.xml b/inrt/src/main/res/layout/activity_settings.xml
index 4a945afa..20175b9c 100644
--- a/inrt/src/main/res/layout/activity_settings.xml
+++ b/inrt/src/main/res/layout/activity_settings.xml
@@ -8,18 +8,18 @@
               android:orientation="vertical">
 
 
-    <android.support.design.widget.AppBarLayout
+    <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:theme="@style/AppTheme.AppBarOverlay">
 
-        <android.support.v7.widget.Toolbar
+        <androidx.appcompat.widget.Toolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             app:popupTheme="@style/AppTheme.PopupOverlay"/>
 
-    </android.support.design.widget.AppBarLayout>
+    </com.google.android.material.appbar.AppBarLayout>
 
     <FrameLayout
         android:id="@+id/fragment_setting"
diff --git a/inrt/src/main/res/xml/provider_paths.xml b/inrt/src/main/res/xml/provider_paths.xml
new file mode 100644
index 00000000..beef31d7
--- /dev/null
+++ b/inrt/src/main/res/xml/provider_paths.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<paths xmlns:android="http://schemas.android.com/apk/res/android">
+    <external-path name="external_files" path="."/>
+    <files-path name="project" path="project"/>
+    <root-path name="root_files" path="." />
+</paths>
\ No newline at end of file
diff --git a/inrt/src/test/java/com/stardust/auojs/inrt/ExampleUnitTest.java b/inrt/src/test/java/com/stardust/auojs/inrt/ExampleUnitTest.java
index 2c8fa9aa..4defcd24 100644
--- a/inrt/src/test/java/com/stardust/auojs/inrt/ExampleUnitTest.java
+++ b/inrt/src/test/java/com/stardust/auojs/inrt/ExampleUnitTest.java
@@ -1,7 +1,11 @@
 package com.stardust.auojs.inrt;
 
+import com.stardust.util.AdvancedEncryptionStandard;
+
 import org.junit.Test;
 
+import java.util.Arrays;
+
 import static org.junit.Assert.*;
 
 /**
@@ -12,6 +16,11 @@ import static org.junit.Assert.*;
 public class ExampleUnitTest {
     @Test
     public void addition_isCorrect() throws Exception {
-        assertEquals(4, 2 + 2);
+        String key = "e7c2e459ba3069ce2c9f37ea680ddb07";
+        String vec = "0e491e6efc69ddc3";
+        byte[] encrypt = new AdvancedEncryptionStandard(key.getBytes(), vec).encrypt("xxx".getBytes());
+        System.out.println(Arrays.toString(encrypt));
+        byte[] decrypt = new AdvancedEncryptionStandard(key.getBytes(), vec).decrypt(encrypt, 0, encrypt.length);
+        System.out.println(new String(decrypt));
     }
 }
\ No newline at end of file
diff --git a/project-versions.json b/project-versions.json
index 05d5fa82..9ff25112 100644
--- a/project-versions.json
+++ b/project-versions.json
@@ -1,8 +1,8 @@
 {
-    "appVersionCode": 433,
-    "appVersionName": "4.0.4 Alpha4",
-    "target": 28,
-    "mini": 17,
-    "compile": 28,
-    "buildTool": "28.0.3"
+  "appVersionCode": 453,
+  "appVersionName": "4.1.0 Alpha3",
+  "target": 28,
+  "mini": 17,
+  "compile": 28,
+  "buildTool": "28.0.3"
 }
\ No newline at end of file