tt/AutoJs6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add: refactor, jumping for editor

Browse Source
This commit is contained in:
hyb1996
2017-09-29 13:47:19 +08:00
parent bf4e0877a7
commit c114148502
9 changed files with 684 additions and 381 deletions
Download Patch File Download Diff File Expand all files Collapse all files

110
app/src/main/java/com/stardust/scriptdroid/ui/edit/CodeMirrorEditor.java
View File

@@ -1,19 +1,26 @@
package com.stardust.scriptdroid.ui.edit;
import android.content.Context;
import android.content.DialogInterface;
import android.os.Build;
import android.support.annotation.RequiresApi;
import android.util.AttributeSet;
import android.util.TypedValue;
import android.view.Gravity;
import android.webkit.JavascriptInterface;
import android.webkit.JsPromptResult;
import android.webkit.JsResult;
import android.webkit.WebChromeClient;
import android.webkit.WebSettings;
import android.webkit.WebView;
import android.webkit.WebViewClient;
import android.widget.FrameLayout;
import com.afollestad.materialdialogs.DialogAction;
import com.afollestad.materialdialogs.MaterialDialog;
import com.stardust.pio.PFile;
import com.stardust.scriptdroid.R;
import com.stardust.theme.dialog.ThemeColorMaterialDialogBuilder;
import org.apache.commons.lang3.StringEscapeUtils;
import org.jdeferred.Deferred;
@@ -24,6 +31,8 @@ import java.io.File;
import java.io.IOException;
import java.util.Locale;
import java.util.concurrent.Callable;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import io.reactivex.Observable;
import io.reactivex.android.schedulers.AndroidSchedulers;
@@ -32,6 +41,7 @@ import io.reactivex.functions.Consumer;
import io.reactivex.schedulers.Schedulers;
import io.reactivex.subjects.PublishSubject;
import me.zhanghai.android.materialprogressbar.MaterialProgressBar;
import retrofit2.http.GET;
/**
* Created by Stardust on 2017/9/27.
@@ -41,7 +51,6 @@ public class CodeMirrorEditor extends FrameLayout {
private static final String LOG_TAG = "CodeMirrorEditor";
public interface Callback {
void onChange();
@@ -158,7 +167,7 @@ public class CodeMirrorEditor extends FrameLayout {
settings.setNeedInitialFocus(true);
settings.setDisplayZoomControls(false);
mWebView.setWebViewClient(new MyWebViewClient());
mWebView.setWebChromeClient(new WebChromeClient());
mWebView.setWebChromeClient(new MyWebChromeClient());
}
public void setProgress(boolean onProgress) {
@@ -268,6 +277,41 @@ public class CodeMirrorEditor extends FrameLayout {
evalJavaScript("editor.execCommand('replaceAll');");
}
public void jumpToDef() {
evalJavaScript("editor.tern.jumpToDef();");
}
public void jumpToLineStart() {
evalJavaScript("editor.execCommand('goLineStart');");
}
public void jumpToLineEnd() {
evalJavaScript("editor.execCommand('goLineEnd')");
}
public void jumpToStart() {
evalJavaScript("editor.execCommand('goDocStart');");
}
public void jumpToEnd() {
evalJavaScript("editor.execCommand('goDocEnd');");
}
public void showType() {
evalJavaScript("editor.tern.showType();");
}
public void rename() {
evalJavaScript("editor.tern.rename();");
}
public void selectName() {
evalJavaScript("editor.tern.selectName();");
}
public void replace(String keywords, String replacement, boolean usingRegex) {
setQuery(keywords, usingRegex);
replacement = replacement.replace("'", "\'");
@@ -275,6 +319,12 @@ public class CodeMirrorEditor extends FrameLayout {
findNext();
}
public Observable<String> getSelection() {
mStringFromJs = PublishSubject.create();
evalJavaScript("__bridge__.setStringFromJs(editor.getSelection());");
return mStringFromJs;
}
public void replaceSelection() {
evalJavaScript("editor.execCommand('replace');");
}
@@ -355,7 +405,61 @@ public class CodeMirrorEditor extends FrameLayout {
mPageFinished.resolve(null);
evalJavaScript(INIT_SCRIPT);
setProgress(false);
// evalJavaScript("editor.setSize(" + mWebView.getMeasuredWidth() + ", " + mWebView.getMeasuredHeight() + ");");
}
}
private class MyWebChromeClient extends WebChromeClient {
private final Pattern RENAME = Pattern.compile("New name for ([a-zA-Z]+)");
@Override
public boolean onJsPrompt(WebView view, String url, String message, String defaultValue, JsPromptResult result) {
Matcher m = RENAME.matcher(message);
if (m.matches() && m.groupCount() >= 1) {
showRenamePrompt(m.group(1), defaultValue, result);
return true;
}
return super.onJsPrompt(view, url, message, defaultValue, result);
}
private void showRenamePrompt(String name, String defaultValue, final JsPromptResult result) {
new ThemeColorMaterialDialogBuilder(getContext())
.title(getResources().getString(R.string.text_rename) + name)
.input("", defaultValue, new MaterialDialog.InputCallback() {
@Override
public void onInput(@android.support.annotation.NonNull MaterialDialog dialog, CharSequence input) {
result.confirm(input.toString());
}
})
.show();
}
@Override
public boolean onJsAlert(WebView view, String url, String message, final JsResult result) {
new ThemeColorMaterialDialogBuilder(getContext())
.title(R.string.text_alert)
.content(message)
.onPositive(new MaterialDialog.SingleButtonCallback() {
@Override
public void onClick(@android.support.annotation.NonNull MaterialDialog dialog, @android.support.annotation.NonNull DialogAction which) {
result.confirm();
}
})
.cancelListener(new DialogInterface.OnCancelListener() {
@Override
public void onCancel(DialogInterface dialog) {
result.cancel();
}
})
.positiveText(R.string.ok)
.show();
return true;
}
@Override
public void onProgressChanged(WebView view, int newProgress) {
mProgressBar.setVisibility(newProgress == 100 ? VISIBLE : GONE);
}
}
}

71
app/src/main/java/com/stardust/scriptdroid/ui/edit/EditorMenu.java
View File

@@ -38,22 +38,22 @@ public class EditorMenu {
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.action_console:
showConsole();
return true;
case R.id.action_log:
showLog();
return true;
case R.id.action_force_stop:
forceStop();
return true;
case R.id.action_jump:
jump();
return true;
default:
if (onEditOptionsSelected(item)) {
return true;
}
if (onRefactorOptionsSelected(item)) {
return true;
}
if (onJumpOptionsSelected(item)) {
return true;
}
if (onMoreOptionsSelected(item)) {
return true;
}
@@ -61,12 +61,54 @@ public class EditorMenu {
return false;
}
private boolean onJumpOptionsSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.action_jump_to_line:
jumpToLine();
return true;
case R.id.action_jump_to_def:
mEditor.jumpToDef();
return true;
case R.id.action_jump_to_start:
mEditor.jumpToStart();
return true;
case R.id.action_jump_to_end:
mEditor.jumpToEnd();
return true;
case R.id.action_jump_to_line_start:
mEditor.jumpToLineStart();
return true;
case R.id.action_jump_to_line_end:
mEditor.jumpToLineEnd();
return true;
}
return false;
}
private boolean onMoreOptionsSelected(MenuItem item) {
private boolean onRefactorOptionsSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.action_beautify:
beautifyCode();
return true;
case R.id.action_rename:
mEditor.rename();
return true;
case R.id.action_select_variable:
mEditor.selectName();
return true;
}
return false;
}
private boolean onMoreOptionsSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.action_console:
showConsole();
return true;
case R.id.action_show_type:
mEditor.showType();
return true;
case R.id.action_editor_theme:
mEditorView.selectEditorTheme();
return true;
@@ -106,7 +148,7 @@ public class EditorMenu {
return false;
}
private void jump() {
private void jumpToLine() {
mEditor.getLineCount()
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new Consumer<Integer>() {
@@ -180,8 +222,17 @@ public class EditorMenu {
}
private void findOrReplace() {
new FindOrReplaceDialogBuilder(mContext, mEditorView)
.show();
mEditor.getSelection()
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new Consumer<String>() {
@Override
public void accept(@NonNull String s) throws Exception {
new FindOrReplaceDialogBuilder(mContext, mEditorView)
.setQueryIfNotEmpty(s)
.show();
}
});
}
private void copyAll() {

6
app/src/main/java/com/stardust/scriptdroid/ui/edit/FindOrReplaceDialogBuilder.java
View File

@@ -120,4 +120,10 @@ public class FindOrReplaceDialogBuilder extends ThemeColorMaterialDialogBuilder
}
}
public FindOrReplaceDialogBuilder setQueryIfNotEmpty(String s) {
if (!TextUtils.isEmpty(s))
mKeywordsEditText.setText(s);
return this;
}
}