Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix bug #406

Merged
merged 1 commit into from
Apr 1, 2023
Merged

fix bug #406

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions editor/src/main/java/io/github/rosemoe/sora/widget/CodeEditor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -536,7 +536,7 @@ private void initialize(AttributeSet attrs, int defStyleAttr, int defStyleRes) {
}
lineSeparator = LineSeparator.LF;
lineNumberTipTextProvider = DefaultLineNumberTip.INSTANCE;
formatTip = I18nConfig.getString(getContext(), R.string.editor_formatting);
formatTip = I18nConfig.getString(getContext(), R.string.sora_editor_editor_formatting);
props = new DirectAccessProps();
dpUnit = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 10, Resources.getSystem().getDisplayMetrics()) / 10f;
dividerWidth = dpUnit;
Expand Down Expand Up @@ -2420,10 +2420,10 @@ class SearchActionMode implements ActionMode.Callback {
@Override
public boolean onCreateActionMode(ActionMode p1, Menu p2) {
startedActionMode = ACTION_MODE_SEARCH_TEXT;
p2.add(0, 0, 0, I18nConfig.getResourceId(R.string.next)).setShowAsActionFlags(MenuItem.SHOW_AS_ACTION_IF_ROOM);
p2.add(0, 1, 0, I18nConfig.getResourceId(R.string.last)).setShowAsActionFlags(MenuItem.SHOW_AS_ACTION_NEVER);
p2.add(0, 2, 0, I18nConfig.getResourceId(R.string.replace)).setShowAsActionFlags(MenuItem.SHOW_AS_ACTION_NEVER);
p2.add(0, 3, 0, I18nConfig.getResourceId(R.string.replaceAll)).setShowAsActionFlags(MenuItem.SHOW_AS_ACTION_NEVER);
p2.add(0, 0, 0, I18nConfig.getResourceId(R.string.sora_editor_next)).setShowAsActionFlags(MenuItem.SHOW_AS_ACTION_IF_ROOM);
p2.add(0, 1, 0, I18nConfig.getResourceId(R.string.sora_editor_last)).setShowAsActionFlags(MenuItem.SHOW_AS_ACTION_NEVER);
p2.add(0, 2, 0, I18nConfig.getResourceId(R.string.sora_editor_replace)).setShowAsActionFlags(MenuItem.SHOW_AS_ACTION_NEVER);
p2.add(0, 3, 0, I18nConfig.getResourceId(R.string.sora_editor_replaceAll)).setShowAsActionFlags(MenuItem.SHOW_AS_ACTION_NEVER);
SearchView sv = new SearchView(getContext());
sv.setOnQueryTextListener(new SearchView.OnQueryTextListener() {

Expand All @@ -2446,7 +2446,7 @@ public boolean onQueryTextChange(String text) {
});
p1.setCustomView(sv);
sv.performClick();
sv.setQueryHint(I18nConfig.getString(getContext(), R.string.text_to_search));
sv.setQueryHint(I18nConfig.getString(getContext(), R.string.sora_editor_text_to_search));
sv.setIconifiedByDefault(false);
sv.setIconified(false);
return true;
Expand All @@ -2473,12 +2473,12 @@ public boolean onActionItemClicked(final ActionMode am, MenuItem p2) {
case 3:
final boolean replaceAll = p2.getItemId() == 3;
final EditText et = new EditText(getContext());
et.setHint(I18nConfig.getResourceId(R.string.replacement));
et.setHint(I18nConfig.getResourceId(R.string.sora_editor_replacement));
new AlertDialog.Builder(getContext())
.setTitle(I18nConfig.getResourceId(replaceAll ? R.string.replaceAll : R.string.replace))
.setTitle(I18nConfig.getResourceId(replaceAll ? R.string.sora_editor_replaceAll : R.string.sora_editor_replace))
.setView(et)
.setNegativeButton(android.R.string.cancel, null)
.setPositiveButton(I18nConfig.getResourceId(R.string.replace), (dialog, which) -> {
.setPositiveButton(I18nConfig.getResourceId(R.string.sora_editor_replace), (dialog, which) -> {
if (replaceAll) {
getSearcher().replaceAll(et.getText().toString(), am::finish);
} else {
Expand Down Expand Up @@ -3405,7 +3405,7 @@ public void copyText(boolean shouldCopyLine) {
if (cursor.isSelected()) {
int length = cursor.getRight() - cursor.getLeft();
if (length > props.clipboardTextLengthLimit) {
Toast.makeText(getContext(), I18nConfig.getResourceId(R.string.clip_text_length_too_large), Toast.LENGTH_SHORT).show();
Toast.makeText(getContext(), I18nConfig.getResourceId(R.string.sora_editor_clip_text_length_too_large), Toast.LENGTH_SHORT).show();
} else {
var clip = getText().substring(cursor.getLeft(), cursor.getRight());
clipboardManager.setPrimaryClip(ClipData.newPlainText(clip, clip));
Expand All @@ -3415,7 +3415,7 @@ public void copyText(boolean shouldCopyLine) {
}
} catch (RuntimeException e) {
if (e.getCause() instanceof TransactionTooLargeException) {
Toast.makeText(getContext(), I18nConfig.getResourceId(R.string.clip_text_length_too_large), Toast.LENGTH_SHORT).show();
Toast.makeText(getContext(), I18nConfig.getResourceId(R.string.sora_editor_clip_text_length_too_large), Toast.LENGTH_SHORT).show();
} else {
e.printStackTrace();
Toast.makeText(getContext(), e.getClass().toString(), Toast.LENGTH_SHORT).show();
Expand Down
4 changes: 2 additions & 2 deletions editor/src/main/java/io/github/rosemoe/sora/widget/EditorSearcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,11 +313,11 @@ public void replaceAll(@NonNull String replacement, @Nullable final Runnable whe
}
checkState();
if (!isResultValid()) {
Toast.makeText(editor.getContext(), I18nConfig.getResourceId(R.string.editor_search_busy), Toast.LENGTH_SHORT).show();
Toast.makeText(editor.getContext(), I18nConfig.getResourceId(R.string.sora_editor_editor_search_busy), Toast.LENGTH_SHORT).show();
return;
}
var context = editor.getContext();
final var dialog = ProgressDialog.show(context, I18nConfig.getString(context, R.string.replaceAll), I18nConfig.getString(context, R.string.editor_search_replacing), true, false);
final var dialog = ProgressDialog.show(context, I18nConfig.getString(context, R.string.sora_editor_replaceAll), I18nConfig.getString(context, R.string.sora_editor_editor_search_replacing), true, false);
final var res = lastResults;
new Thread(() -> {
try {
Expand Down
2 changes: 1 addition & 1 deletion ...or/src/main/java/io/github/rosemoe/sora/widget/component/EditorDiagnosticTooltipWindow.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ open class EditorDiagnosticTooltipWindow(editor: CodeEditor) : EditorPopupWindow
dismiss()
}
}
moreActionText.setText(I18nConfig.getResourceId(R.string.diagnostics_more_actions))
moreActionText.setText(I18nConfig.getResourceId(R.string.sora_editor_diagnostics_more_actions))
moreActionText.setOnClickListener { _ ->
val quickfixes = currentDiagnostic?.quickfixes
if (!quickfixes.isNullOrEmpty() && quickfixes.size > 1) {
Expand Down
2 changes: 1 addition & 1 deletion editor/src/main/res/layout/diagnostic_tooltip_window.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
style="?android:buttonBarButtonStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/diagnostics_more_actions"
android:text="@string/sora_editor_diagnostics_more_actions"
android:textAllCaps="false"
android:textColor="@android:color/holo_blue_light" />

Expand Down
24 changes: 12 additions & 12 deletions editor/src/main/res/values-zh/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,16 +23,16 @@
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->

<resources>
<string name="last">上个</string>
<string name="next">下个</string>
<string name="replace">替换</string>
<string name="replaceAll">替换全部</string>
<string name="replacement">替换文本</string>
<string name="editor_search_replacing">正在替换…</string>
<string name="editor_search_busy">编辑器正在准备…</string>
<string name="editor_formatting">正在格式化…</string>
<string name="text_to_search">欲搜索文本</string>
<string name="more">更多</string>
<string name="diagnostics_more_actions">更多操作…</string>
<string name="clip_text_length_too_large">文本过大，无法复制</string>
<string name="sora_editor_last">上个</string>
<string name="sora_editor_next">下个</string>
<string name="sora_editor_replace">替换</string>
<string name="sora_editor_replaceAll">替换全部</string>
<string name="sora_editor_replacement">替换文本</string>
<string name="sora_editor_editor_search_replacing">正在替换…</string>
<string name="sora_editor_editor_search_busy">编辑器正在准备…</string>
<string name="sora_editor_editor_formatting">正在格式化…</string>
<string name="sora_editor_text_to_search">欲搜索文本</string>
<string name="sora_editor_more">更多</string>
<string name="sora_editor_diagnostics_more_actions">更多操作…</string>
<string name="sora_editor_clip_text_length_too_large">文本过大，无法复制</string>
</resources>
24 changes: 12 additions & 12 deletions editor/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,17 +25,17 @@

<resources>

<string name="last">Last</string>
<string name="next">Next</string>
<string name="replace">Replace</string>
<string name="replaceAll">Replace All</string>
<string name="replacement">Replacement</string>
<string name="text_to_search">Text to search</string>
<string name="editor_search_replacing">Replacing texts…</string>
<string name="editor_search_busy">Editor is still preparing…</string>
<string name="editor_formatting">Formatting your code…</string>
<string name="more">More</string>
<string name="diagnostics_more_actions">More Actions...</string>
<string name="clip_text_length_too_large">Text is too large to copy</string>
<string name="sora_editor_last">Last</string>
<string name="sora_editor_next">Next</string>
<string name="sora_editor_replace">Replace</string>
<string name="sora_editor_replaceAll">Replace All</string>
<string name="sora_editor_replacement">Replacement</string>
<string name="sora_editor_text_to_search">Text to search</string>
<string name="sora_editor_editor_search_replacing">Replacing texts…</string>
<string name="sora_editor_editor_search_busy">Editor is still preparing…</string>
<string name="sora_editor_editor_formatting">Formatting your code…</string>
<string name="sora_editor_more">More</string>
<string name="sora_editor_diagnostics_more_actions">More Actions...</string>
<string name="sora_editor_clip_text_length_too_large">Text is too large to copy</string>

</resources>