Skip to content

Commit cc0e2ca

Browse files
committed
remove wrap char
1 parent 840b1c5 commit cc0e2ca

File tree

7 files changed

+6
-75
lines changed

7 files changed

+6
-75
lines changed

libeditor/src/main/java/com/duy/ide/core/SimpleEditorActivity.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@
6767
import com.jecelyin.editor.v2.dialog.CharsetsDialog;
6868
import com.jecelyin.editor.v2.dialog.GotoLineDialog;
6969
import com.jecelyin.editor.v2.dialog.LangListDialog;
70-
import com.jecelyin.editor.v2.dialog.WrapCharDialog;
7170
import com.jecelyin.editor.v2.editor.EditorDelegate;
7271
import com.jecelyin.editor.v2.editor.IEditorDelegate;
7372
import com.jecelyin.editor.v2.editor.IEditorStateListener;
@@ -430,10 +429,7 @@ public void onClick(String file, String encoding) {
430429
});
431430
rfm.show(this);
432431

433-
} else if (id == R.id.action_wrap) {
434-
new WrapCharDialog(this).show();
435-
436-
} else if (id == R.id.action_highlight) {
432+
} else if (id == R.id.action_highlight) {
437433
new LangListDialog(this).show();
438434

439435
} else if (id == R.id.m_menu) {

libeditor/src/main/java/com/duy/ide/editor/view/HighlightEditorView.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import android.support.annotation.NonNull;
2626
import android.support.annotation.Nullable;
2727
import android.text.InputFilter;
28+
import android.text.InputType;
2829
import android.text.Layout;
2930
import android.text.Spanned;
3031
import android.text.TextPaint;
@@ -93,6 +94,10 @@ private void init(Context context) {
9394
setSaveEnabled(false);
9495

9596
setImeOptions(EditorInfo.IME_ACTION_DONE | EditorInfo.IME_FLAG_NO_EXTRACT_UI);
97+
setInputType(InputType.TYPE_CLASS_TEXT
98+
| InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS
99+
| InputType.TYPE_TEXT_FLAG_MULTI_LINE
100+
| InputType.TYPE_TEXT_FLAG_IME_MULTI_LINE);
96101

97102
mLineManager = new LineManager(this);
98103
mPreferences = mLayoutContext.preferences = Preferences.getInstance(getContext());

libeditor/src/main/java/com/jecelyin/editor/v2/common/Command.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ public enum CommandEnum {
4646
PASTE,
4747
SELECT_ALL,
4848
DUPLICATION,
49-
CONVERT_WRAP_CHAR,
5049
GOTO_INDEX,
5150
FIND,
5251
GOTO_TOP,

libeditor/src/main/java/com/jecelyin/editor/v2/dialog/WrapCharDialog.java

Lines changed: 0 additions & 61 deletions
This file was deleted.

libeditor/src/main/java/com/jecelyin/editor/v2/editor/EditorDelegate.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -308,11 +308,6 @@ public void doCommand(Command command) {
308308
if (!readonly)
309309
mEditText.duplicateSelection();
310310
break;
311-
// TODO: 04-Jun-18 remove
312-
case CONVERT_WRAP_CHAR:
313-
// if (!readonly)
314-
// mEditText.convertWrapCharTo((String) command.object);
315-
break;
316311
case GOTO_INDEX:
317312
int col = command.args.getInt("col", -1);
318313
int line = command.args.getInt("line", -1);

libeditor/src/main/java/com/jecelyin/editor/v2/widget/menu/MenuFactory.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
import java.util.List;
2929
import java.util.Map;
3030

31-
import static com.jecelyin.editor.v2.common.Command.CommandEnum.CONVERT_WRAP_CHAR;
3231
import static com.jecelyin.editor.v2.common.Command.CommandEnum.CURSOR_BACK;
3332
import static com.jecelyin.editor.v2.common.Command.CommandEnum.CURSOR_FORWARD;
3433
import static com.jecelyin.editor.v2.common.Command.CommandEnum.DOC_INFO;
@@ -121,7 +120,6 @@ private void initAllMenuItem() {
121120

122121
menuItemInfos.add(new MenuItemInfo(MenuGroup.EDIT, R.id.action_undo, UNDO, R.drawable.ic_undo_white_24dp, R.string.undo));
123122
menuItemInfos.add(new MenuItemInfo(MenuGroup.EDIT, R.id.action_redo, REDO, R.drawable.ic_redo_white_24dp, R.string.redo));
124-
menuItemInfos.add(new MenuItemInfo(MenuGroup.EDIT, R.id.action_wrap, CONVERT_WRAP_CHAR, R.drawable.ic_wrap_text_white_24dp, R.string.line_separator));
125123
menuItemInfos.add(new MenuItemInfo(MenuGroup.EDIT, R.id.action_find_replace, FIND, R.drawable.ic_find_in_page_white_24dp, R.string.find_or_replace));
126124
menuItemInfos.add(new MenuItemInfo(MenuGroup.EDIT, R.id.action_goto_top, GOTO_TOP, R.drawable.ic_vertical_align_top_white_24dp, R.string.jump_to_start));
127125
menuItemInfos.add(new MenuItemInfo(MenuGroup.EDIT, R.id.action_goto_end, GOTO_END, R.drawable.ic_vertical_align_bottom_white_24dp, R.string.jump_to_end));

libeditor/src/main/res/values/ids.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
<item name="m_select_all" type="id" />
1313
<item name="action_undo" type="id" />
1414
<item name="action_redo" type="id" />
15-
<item name="action_wrap" type="id" />
1615
<item name="m_duplication" type="id" />
1716
<item name="action_find_replace" type="id" />
1817
<item name="action_goto_top" type="id" />

0 commit comments

Comments
 (0)