diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
new file mode 100644
index 00000000..09d75975
Binary files /dev/null and b/.idea/caches/build_file_checksums.ser differ
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
new file mode 100644
index 00000000..1b59ec50
--- /dev/null
+++ b/.idea/codeStyles/Project.xml
@@ -0,0 +1,221 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ xmlns:android
+ ^$
+
+
+
+
+
+
+
+
+ xmlns:.*
+ ^$
+
+
+ BY_NAME
+
+
+
+
+
+
+ .*:id
+ http://schemas.android.com/apk/res/android
+
+
+
+
+
+
+
+
+ .*:name
+ http://schemas.android.com/apk/res/android
+
+
+
+
+
+
+
+
+ name
+ ^$
+
+
+
+
+
+
+
+
+ style
+ ^$
+
+
+
+
+
+
+
+
+ .*
+ ^$
+
+
+ BY_NAME
+
+
+
+
+
+
+ .*:layout_width
+ http://schemas.android.com/apk/res/android
+
+
+
+
+
+
+
+
+ .*:layout_height
+ http://schemas.android.com/apk/res/android
+
+
+
+
+
+
+
+
+ .*:layout_.*
+ http://schemas.android.com/apk/res/android
+
+
+ BY_NAME
+
+
+
+
+
+
+ .*:width
+ http://schemas.android.com/apk/res/android
+
+
+ BY_NAME
+
+
+
+
+
+
+ .*:height
+ http://schemas.android.com/apk/res/android
+
+
+ BY_NAME
+
+
+
+
+
+
+ .*
+ http://schemas.android.com/apk/res/android
+
+
+ BY_NAME
+
+
+
+
+
+
+ .*
+ .*
+
+
+ BY_NAME
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
new file mode 100644
index 00000000..8f1a3b79
--- /dev/null
+++ b/.idea/codeStyles/codeStyleConfig.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 05d0b0c3..d7af1f9a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,8 +8,8 @@ android {
applicationId "org.autojs.autojs"
minSdkVersion 17
targetSdkVersion 23
- versionCode 263
- versionName "3.1.1 Alpha7"
+ versionCode 400
+ versionName "4.0.0 Alpha"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
multiDexEnabled true
ndk {
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
new file mode 100644
index 00000000..add6b009
--- /dev/null
+++ b/app/src/main/java/org/autojs/autojs/theme/dialog/ThemeColorMaterialDialogBuilder.java
@@ -0,0 +1,28 @@
+package org.autojs.autojs.theme.dialog;
+
+import android.content.Context;
+import android.support.annotation.NonNull;
+
+import com.afollestad.materialdialogs.MaterialDialog;
+import com.stardust.theme.ThemeColor;
+import com.stardust.theme.ThemeColorManager;
+import com.stardust.theme.ThemeColorMutable;
+
+/**
+ * Created by Stardust on 2017/3/5.
+ */
+
+public class ThemeColorMaterialDialogBuilder extends MaterialDialog.Builder implements ThemeColorMutable {
+ public ThemeColorMaterialDialogBuilder(@NonNull Context context) {
+ super(context);
+ ThemeColorManager.add(this);
+ }
+
+ @Override
+ public void setThemeColor(ThemeColor themeColor) {
+ int color = themeColor.colorPrimary;
+ positiveColor(color);
+ negativeColor(color);
+ neutralColor(color);
+ }
+}
diff --git a/autojs/src/main/assets/.vscode/launch.json b/autojs/src/main/assets/.vscode/launch.json
new file mode 100644
index 00000000..897fbc7a
--- /dev/null
+++ b/autojs/src/main/assets/.vscode/launch.json
@@ -0,0 +1,14 @@
+{
+ // 使用 IntelliSense 了解相关属性。
+ // 悬停以查看现有属性的描述。
+ // 欲了解更多信息，请访问: https://go.microsoft.com/fwlink/?linkid=830387
+ "version": "0.2.0",
+ "configurations": [
+ {
+ "type": "node",
+ "request": "launch",
+ "name": "启动程序",
+ "program": "${file}"
+ }
+ ]
+}
\ No newline at end of file
diff --git a/common/release/output.json b/common/release/output.json
new file mode 100644
index 00000000..9660bb09
--- /dev/null
+++ b/common/release/output.json
@@ -0,0 +1 @@
+[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":263},"path":"commonRelease-4.0.0 Alpha.apk","properties":{"packageId":"org.autojs.autojs","split":"","minSdkVersion":"17"}}]
\ No newline at end of file
diff --git a/coolapk/release/output.json b/coolapk/release/output.json
new file mode 100644
index 00000000..9585b1c7
--- /dev/null
+++ b/coolapk/release/output.json
@@ -0,0 +1 @@
+[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":256},"path":"coolapkRelease-3.1.0 Beta.apk","properties":{"packageId":"org.autojs.autojs","split":"","minSdkVersion":"17"}}]
\ No newline at end of file