From d88287757356beb623a35fd8b46a2443450be39c Mon Sep 17 00:00:00 2001 From: hyb1996 <946994919@qq.com> Date: Mon, 27 Nov 2017 14:40:37 +0800 Subject: [PATCH] add: option 'docs source' --- app/src/main/AndroidManifest.xml | 2 +- .../java/com/stardust/scriptdroid/Pref.java | 7 +++- app/src/main/res/values/strings.xml | 23 +---------- app/src/main/res/xml/preferences.xml | 13 +++++++ autojs/src/main/res/values/arrays.xml | 39 +++++++++++++++++++ 5 files changed, 61 insertions(+), 23 deletions(-) create mode 100644 autojs/src/main/res/values/arrays.xml diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 4eee4b93..84f8b428 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -19,7 +19,7 @@ xmlns:tools="http://schemas.android.com/tools" android:name=".App" android:allowBackup="false" - android:icon="@drawable/autojs_logo" + android:icon="@drawable/ic_android_eat_js" android:label="@string/_app_name" android:supportsRtl="true" android:theme="@style/AppTheme" diff --git a/app/src/main/java/com/stardust/scriptdroid/Pref.java b/app/src/main/java/com/stardust/scriptdroid/Pref.java index 8e0f17b0..44a662ad 100644 --- a/app/src/main/java/com/stardust/scriptdroid/Pref.java +++ b/app/src/main/java/com/stardust/scriptdroid/Pref.java @@ -146,7 +146,12 @@ public class Pref { } public static String getDocumentationUrl() { - return "file:///android_asset/docs/"; + String docSource = def().getString(getString(R.string.key_documentation_source), null); + if (docSource == null || docSource.equals("Local")) { + return "file:///android_asset/docs/"; + } else { + return "https://hyb1996.github.io/AutoJs-Docs/"; + } } public static boolean isFloatingMenuShown() { diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 1bd63c96..6d61681e 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -286,28 +286,7 @@ 通知权限 - - 默认 - 每天显示一次 - 关闭广告 - - - Default - OncePerDay - Off - - - - - 可编辑的js文件 - 不可编辑的二进制文件 - - - - js - binary - LogActivity 打开主界面 全选 @@ -331,4 +310,6 @@ 生成并复制 生成并打开编辑器 生成失败了o(╥﹏╥)o + key_documentation_source + 文档源 diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml index 6d81466a..1e874392 100644 --- a/app/src/main/res/xml/preferences.xml +++ b/app/src/main/res/xml/preferences.xml @@ -111,6 +111,19 @@ /> + + + + + diff --git a/autojs/src/main/res/values/arrays.xml b/autojs/src/main/res/values/arrays.xml new file mode 100644 index 00000000..e77fc8af --- /dev/null +++ b/autojs/src/main/res/values/arrays.xml @@ -0,0 +1,39 @@ + + + + + + 默认 + 每天显示一次 + 关闭广告 + + + + Default + OncePerDay + Off + + + + + 可编辑的js文件 + 不可编辑的二进制文件 + + + + js + binary + + + + + + 本地文档 + 在线文档 + + + + Local + Online + + \ No newline at end of file