Skip to content

Commit d0b2740

Browse files
committed
Fix can not undo
1 parent 26b5610 commit d0b2740

File tree

15 files changed

+476
-65
lines changed

15 files changed

+476
-65
lines changed

app/src/main/java/com/duy/editor/CodeEditorActivity.java

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,8 @@
4242
import com.duy.editor.theme.ThemeActivity;
4343
import com.duy.file.explorer.FileExplorerActivity;
4444
import com.duy.ide.core.SimpleEditorActivity;
45-
import com.duy.ide.editor.view.IEditAreaView;
4645
import com.jecelyin.common.utils.UIUtils;
4746
import com.jecelyin.editor.v2.Preferences;
48-
import com.jecelyin.editor.v2.editor.Document;
4947
import com.jecelyin.editor.v2.editor.EditorDelegate;
5048
import com.jecelyin.editor.v2.editor.IEditorDelegate;
5149
import com.jecelyin.editor.v2.widget.menu.MenuDef;
@@ -146,12 +144,6 @@ protected void onCreateNavigationMenu(Menu menu) {
146144
super.onCreateNavigationMenu(menu);
147145
}
148146

149-
@Override
150-
public void invalidateEditMenu(Document document, IEditAreaView mEditText) {
151-
super.invalidateEditMenu(document, mEditText);
152-
setMenuStatus(R.id.action_run, document != null ? MenuDef.STATUS_NORMAL : MenuDef.STATUS_DISABLED);
153-
}
154-
155147
@Override
156148
public boolean onOptionsItemSelected(MenuItem item) {
157149
switch (item.getItemId()) {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,12 @@
2929

3030
</LinearLayout>
3131

32-
<com.duy.ide.editor.view.EditActionSupportEditor
32+
<com.duy.ide.editor.view.CodeEditor
3333
android:id="@+id/editor_view"
3434
android:layout_width="match_parent"
3535
android:layout_height="wrap_content"
3636
android:typeface="monospace">
3737

38-
</com.duy.ide.editor.view.EditActionSupportEditor>
38+
</com.duy.ide.editor.view.CodeEditor>
3939
</LinearLayout>
4040

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

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@
5353
import com.duy.ide.diagnostic.view.DiagnosticFragment;
5454
import com.duy.ide.editor.editor.BuildConfig;
5555
import com.duy.ide.editor.editor.R;
56-
import com.duy.ide.editor.view.IEditAreaView;
5756
import com.duy.ide.file.FileManager;
5857
import com.duy.ide.file.SaveListener;
5958
import com.duy.ide.file.dialogs.DialogNewFile;
@@ -69,7 +68,6 @@
6968
import com.jecelyin.editor.v2.dialog.GotoLineDialog;
7069
import com.jecelyin.editor.v2.dialog.LangListDialog;
7170
import com.jecelyin.editor.v2.dialog.WrapCharDialog;
72-
import com.jecelyin.editor.v2.editor.Document;
7371
import com.jecelyin.editor.v2.editor.EditorDelegate;
7472
import com.jecelyin.editor.v2.editor.IEditorDelegate;
7573
import com.jecelyin.editor.v2.editor.IEditorStateListener;
@@ -361,7 +359,7 @@ public boolean onCreateOptionsMenu(Menu container) {
361359
continue;
362360
}
363361
SubMenu subMenu = container.addSubMenu(MenuDef.GROUP_TOOLBAR, group.getMenuId(), 0, group.getTitleId());
364-
subMenu.getItem().setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS | MenuItem.SHOW_AS_ACTION_WITH_TEXT);
362+
subMenu.getItem().setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
365363
if (group.getIconId() != 0) {
366364
subMenu.getItem().setIcon(MenuManager.makeToolbarNormalIcon(this, group.getIconId()));
367365
}
@@ -737,14 +735,6 @@ public RecyclerView getTabRecyclerView() {
737735
return mTabRecyclerView;
738736
}
739737

740-
@CallSuper
741-
public void invalidateEditMenu(Document document, IEditAreaView mEditText) {
742-
// setMenuStatus(R.id.action_save, document.isChanged() ? MenuDef.STATUS_NORMAL : MenuDef.STATUS_DISABLED);
743-
// setMenuStatus(R.id.action_undo, mEditText != null && mEditText.isCanUndo() ? MenuDef.STATUS_NORMAL : MenuDef.STATUS_DISABLED);
744-
// setMenuStatus(R.id.action_redo, mEditText != null && mEditText.isCanRedo() ? MenuDef.STATUS_NORMAL : MenuDef.STATUS_DISABLED);
745-
}
746-
747-
748738
@Override
749739
public void onEditorViewCreated(IEditorDelegate editorDelegate) {
750740

0 commit comments

Comments
 (0)