Full translated

app/build.gradle

@@ -9,8 +9,8 @@ android {
         applicationId "cn.rbc.termuc"
         minSdkVersion 21
         targetSdkVersion 29
-        versionCode 1
-        versionName "0.1"
+        versionCode 2
+        versionName "0.1.1"
     }
 
     buildTypes {

app/src/main/java/cn/rbc/termuc/EditFragment.java

@@ -72,7 +72,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
 			MainActivity.lsp.didOpen(fl, (type&1)==1?"cpp":"c", s);
 		} catch(IOException fnf) {
 			fnf.printStackTrace();
-			Toast.makeText(ma, "打开失败！", Toast.LENGTH_SHORT).show();
+			Toast.makeText(ma, R.string.open_failed, Toast.LENGTH_SHORT).show();
 		}
 		return editor;
 	}

app/src/main/java/cn/rbc/termuc/MainActivity.java

@@ -27,7 +27,7 @@ public class MainActivity extends Activity implements
 
     private ArrayAdapter<String> hda;
 	private FileAdapter adp;
-	private FragmentManager mFmgr;
+	FragmentManager mFmgr;
 	private EditFragment lastFrag = null;
 	private boolean byhand = true, inited = false;
     private View keys, showlist;
@@ -252,7 +252,7 @@ public boolean onOptionsItemSelected(MenuItem menuItem) {
 				try {
 					lastFrag.save();
 					lsp.didSave(lastFrag.getFile());
-					toast("已保存");
+					toast(getText(R.string.saved));
 				} catch(IOException e) {
 					e.printStackTrace();
 				}
@@ -373,10 +373,10 @@ public void createFile(View view) {
         View inflate = View.inflate(this, R.layout.edit, null);
         transTxV = inflate.findViewById(R.id.edit_name);
 		new AlertDialog.Builder(this)
-		.setTitle("新建")
+		.setTitle(R.string.new_)
 		.setView(inflate)
-		.setPositiveButton("文件", this)
-		.setNeutralButton("文件夹", this)
+		.setPositiveButton(R.string.file, this)
+		.setNeutralButton(R.string.folder, this)
 		.setNegativeButton(android.R.string.cancel, null)
 		.create().show();
     }

app/src/main/java/cn/rbc/termuc/MainHandler.java

@@ -9,6 +9,7 @@
 import cn.rbc.codeeditor.view.autocomplete.*;
 import static android.util.JsonToken.*;
 import java.nio.charset.*;
+import android.net.*;
 
 public class MainHandler extends Handler implements Comparator<ErrSpan> {
 	private MainActivity ma;
@@ -29,7 +30,8 @@ public class MainHandler extends Handler implements Comparator<ErrSpan> {
 	RESU = "result",
 	SEVE = "severity",
 	TEDIT = "textEdit",
-	TG = "triggerCharacters";
+	TG = "triggerCharacters",
+	URI = "uri";
 
 	public MainHandler(MainActivity ma) {
 		super();
@@ -56,7 +58,6 @@ public void handleMessage(Message msg) {
 			int sl = 0, sc = 0, el = 0, ec = 0;
 			Object tmp1 = null, tmp2 = null, tmp3 = null;
 	LOOP:	while (true) {
-				Log.i("LSP", stack.toString());
 				switch (jr.peek()) {
 					case NAME:
 						String n = jr.nextName();
@@ -128,6 +129,18 @@ public void handleMessage(Message msg) {
 									jr.beginObject();
 								stack.push(n);
 								break;
+							case URI:
+								if (DG.equals(stack.peek())) {
+									String tag = Uri.parse(jr.nextString()).getPath();
+									jr.close();
+									TextEditor te = (TextEditor)ma.mFmgr.findFragmentByTag(tag).getView();
+									ArrayList<ErrSpan> a = (ArrayList<ErrSpan>)tmp1;
+									a.sort(this);
+									te.getText().setDiag(a);
+									te.invalidate();
+									break LOOP;
+								}
+								break;
 							case TEDIT:
 								tmp3 = new Edit();
 							case COMPLE:
@@ -208,17 +221,10 @@ public void handleMessage(Message msg) {
 							case IT:
 								ma.getEditor().getAutoCompletePanel().update((ArrayList<ListItem>)tmp1);
 								break LOOP;
-							case DG:
-								jr.close();
-								ArrayList<ErrSpan> a = (ArrayList<ErrSpan>)tmp1;
-								a.sort(this);
-								TextEditor te = ma.getEditor();
-								te.getText().setDiag(a);
-								te.invalidate();
-								break LOOP;
+							//case DG:
 							case RESU:
 								jr.close();
-								te = ma.getEditor();
+								TextEditor te = ma.getEditor();
 								Document doc = te.getText();
 								doc.beginBatchEdit();
 								long tpl = System.nanoTime();

app/src/main/java/cn/rbc/termuc/SearchAction.java

@@ -57,7 +57,7 @@ public boolean onActionItemClicked(ActionMode p1, MenuItem p2) {
 			i = indexDoc(ed, idx+1);
 		}
 		if (i==-1) {
-			ma.toast("查找结束");
+			HelperUtils.show(Toast.makeText(ma, R.string.find_completed, Toast.LENGTH_SHORT));
 			idx = 0;
 			te.setSelection(0,0);
 		} else {

app/src/main/res/layout/activity_main.xml

@@ -9,7 +9,7 @@
 
 	<ImageButton
 		android:src="@android:drawable/ic_menu_more"
-		android:tooltipText="浏览文件"
+		android:tooltipText="@string/browse_files"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:layout_alignParentRight="true"

app/src/main/res/layout/edit.xml

@@ -5,6 +5,6 @@
     <EditText
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:hint="名称"
+		android:hint="@string/hint_filename"
 		android:id="@+id/edit_name"/>
 </LinearLayout>

app/src/main/res/layout/list_header.xml

@@ -23,7 +23,7 @@
 
 		<Button
 			android:layout_width="wrap_content"
-			android:tooltipText="创建文件(夹)"
+			android:tooltipText="@string/new_f"
 			style="?android:attr/buttonBarButtonStyle"
 			android:layout_height="wrap_content"
 			android:text="+"

app/src/main/res/layout/search_action.xml

@@ -13,7 +13,7 @@
 		android:background="@null"
 		android:singleLine="true"
 		android:maxLines="1"
-		android:hint="搜索..."
+		android:hint="@string/find_"
 		android:id="@+id/search_edit"
 		android:layout_weight="1.0"/>
 

app/src/main/res/menu/main.xml

@@ -27,7 +27,7 @@
 			ad:alphabeticModifiers="CTRL"/>
 	<item
 			ad:id="@+id/search"
-			ad:title="@string/search"
+			ad:title="@string/find"
 			ad:alphabeticShortcut="f"
 			ad:alphabeticModifiers="CTRL"/>
 	<item

app/src/main/res/menu/search.xml

@@ -3,9 +3,9 @@
     <item
         ad:id="@+id/menu_last"
 		ad:showAsAction="always"
-        ad:title="上个"/>
+        ad:title="@string/prev"/>
     <item
         ad:id="@+id/menu_next"
 		ad:showAsAction="always"
-        ad:title="下个"/>
+        ad:title="@string/next"/>
 </menu>

app/src/main/res/values-zh/strings.xml

@@ -12,7 +12,7 @@
     <string name="undo">撤销</string>
     <string name="redo">重做</string>
     <string name="save">保存</string>
-    <string name="search">查找</string>
+    <string name="find">查找</string>
     <string name="close">关闭</string>
     <string name="no_open_files">未打开文件</string>
 	<string name="analysis">代码分析</string>
@@ -25,4 +25,16 @@
 	<string name="lsp_port">服务器端口</string>
 	<string name="file_modified">文件 %s 已被修改，您是否需要重新加载？</string>
 	<string name="confirm_delete">是否删除 %s？</string>
+	<string name="new_">新建</string>
+	<string name="file">文件</string>
+	<string name="folder">文件夹</string>
+	<string name="saved">已保存</string>
+	<string name="open_failed">打开失败！</string>
+	<string name="browse_files">浏览文件</string>
+	<string name="hint_filename">名称（例如 main.cpp）</string>
+	<string name="new_f">新建文件（夹）</string>
+	<string name="find_">查找…</string>
+	<string name="next">向后</string>
+	<string name="prev">向前</string>
+	<string name="find_completed">查找结束</string>
 </resources>

app/src/main/res/values/strings.xml

@@ -12,7 +12,7 @@
     <string name="undo">Undo</string>
     <string name="redo">Redo</string>
     <string name="save">Save</string>
-    <string name="search">Search</string>
+    <string name="find">Find</string>
     <string name="close">Close</string>
 	<string name="no_open_files">No Open Files</string>
 	<string name="analysis">Code Analysis</string>
@@ -25,6 +25,18 @@
 	<string name="lsp_port">Server Port</string>
     <string name="file_modified">The file %s has been modified. Do you want to reload it?</string>
 	<string name="confirm_delete">Do you want to delete %s?</string>
+	<string name="new_">New</string>
+	<string name="file">File</string>
+	<string name="folder">Folder</string>
+	<string name="saved">Saved</string>
+	<string name="open_failed">Open failed!</string>
+	<string name="browse_files">Browse Files</string>
+	<string name="hint_filename">Name (eg: main.cpp)</string>
+	<string name="new_f">New File/Folder</string>
+	<string name="find_">Find...</string>
+	<string name="next">Next</string>
+	<string name="prev">Prev</string>
+	<string name="find_completed">Find Completed</string>
 	<string-array name="engine">
 		<item>@string/lang_serv</item>
 		<item>@string/local</item>

fastlane/metadata/android/en-US/changelogs/2.txt

@@ -0,0 +1,2 @@
+- Full translated
+- Fixed bugs when detecting file changes