Skip to content

Commit ff513fe

Browse files
tranleduy2000tranleduy2000
committed
Cleanup menu
1 parent 3885f56 commit ff513fe

File tree

4 files changed

+27
-101
lines changed

4 files changed

+27
-101
lines changed

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

Lines changed: 26 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -94,33 +94,35 @@ protected void onCreateNavigationMenu(Menu menu) {
9494
}
9595
menu.add(MenuDef.GROUP_NAVIGATION, R.id.action_editor_color_scheme, 0, R.string.editor_theme)
9696
.setIcon(R.drawable.ic_color_lens_white_24dp);
97-
98-
99-
SubMenu codeMenu = menu.addSubMenu(R.string.code);
100-
codeMenu.add(MenuDef.GROUP_NAVIGATION, R.id.action_build_native_activity, 0, R.string.build_native_activity)
101-
.setIcon(R.drawable.baseline_build_24);
102-
codeMenu.add(MenuDef.GROUP_NAVIGATION, R.id.action_build_sdl_activity, 0, R.string.build_sdl_activity)
103-
.setIcon(R.drawable.baseline_build_24);
104-
codeMenu.add(MenuDef.GROUP_NAVIGATION, R.id.action_run_sdl_activity, 0, R.string.run_sdl_activity)
105-
.setIcon(R.drawable.ic_play_arrow_white_24dp);
106-
107-
codeMenu.add(MenuDef.GROUP_NAVIGATION, R.id.action_c_example, 0, R.string.title_menu_c_example)
108-
.setIcon(R.drawable.ic_code_black_24dp);
109-
codeMenu.add(MenuDef.GROUP_NAVIGATION, R.id.action_cpp_example, 0, R.string.title_menu_cpp_example)
110-
.setIcon(R.drawable.ic_code_black_24dp);
111-
codeMenu.add(MenuDef.GROUP_NAVIGATION, R.id.action_open_terminal, 0, R.string.title_menu_terminal)
112-
.setIcon(R.drawable.ic_terminal_black);
113-
if (BuildConfig.DEBUG) {
114-
codeMenu.add(MenuDef.GROUP_NAVIGATION, R.id.action_install_add_on, 0, R.string.title_menu_add_ons)
115-
.setIcon(R.drawable.baseline_extension_24);
97+
{
98+
SubMenu buildMenu = menu.addSubMenu(R.string.build);
99+
buildMenu.add(MenuDef.GROUP_NAVIGATION, R.id.action_build_native_activity, 0, R.string.build_native_activity)
100+
.setIcon(R.drawable.baseline_build_24);
101+
buildMenu.add(MenuDef.GROUP_NAVIGATION, R.id.action_run_sdl_activity, 0, R.string.run_sdl_activity)
102+
.setIcon(R.drawable.ic_play_arrow_white_24dp);
116103
}
117104

105+
{
106+
SubMenu codeMenu = menu.addSubMenu(R.string.code);
107+
codeMenu.add(MenuDef.GROUP_NAVIGATION, R.id.action_c_example, 0, R.string.title_menu_c_example)
108+
.setIcon(R.drawable.ic_code_black_24dp);
109+
codeMenu.add(MenuDef.GROUP_NAVIGATION, R.id.action_cpp_example, 0, R.string.title_menu_cpp_example)
110+
.setIcon(R.drawable.ic_code_black_24dp);
111+
codeMenu.add(MenuDef.GROUP_NAVIGATION, R.id.action_open_terminal, 0, R.string.title_menu_terminal)
112+
.setIcon(R.drawable.ic_terminal_black);
113+
if (BuildConfig.DEBUG) {
114+
codeMenu.add(MenuDef.GROUP_NAVIGATION, R.id.action_install_add_on, 0, R.string.title_menu_add_ons)
115+
.setIcon(R.drawable.baseline_extension_24);
116+
}
117+
}
118118

119-
SubMenu settingMenu = menu.addSubMenu(R.string.settings);
120-
settingMenu.add(MenuDef.GROUP_NAVIGATION, R.id.action_term_preferences, 0, R.string.title_term_preferences)
121-
.setIcon(R.drawable.ic_settings_white_24dp);
122-
settingMenu.add(MenuDef.GROUP_NAVIGATION, R.id.action_compiler_setting, 0, R.string.compiler_setting)
123-
.setIcon(R.drawable.ic_settings_white_24dp);
119+
{
120+
SubMenu settingMenu = menu.addSubMenu(R.string.settings);
121+
settingMenu.add(MenuDef.GROUP_NAVIGATION, R.id.action_term_preferences, 0, R.string.title_term_preferences)
122+
.setIcon(R.drawable.ic_settings_white_24dp);
123+
settingMenu.add(MenuDef.GROUP_NAVIGATION, R.id.action_compiler_setting, 0, R.string.compiler_setting)
124+
.setIcon(R.drawable.ic_settings_white_24dp);
125+
}
124126
super.onCreateNavigationMenu(menu);
125127
}
126128

‎app/src/main/java/com/pdaxrom/utils/FileDialog.java‎

Lines changed: 0 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,10 @@
44
import android.app.ProgressDialog;
55
import android.content.Context;
66
import android.content.DialogInterface;
7-
import android.os.AsyncTask;
87
import android.os.Bundle;
98
import android.os.Environment;
109
import android.support.v7.app.AppCompatActivity;
1110
import android.support.v7.view.ActionMode;
12-
import android.util.Log;
1311
import android.view.KeyEvent;
1412
import android.view.View;
1513
import android.view.View.OnClickListener;
@@ -27,7 +25,6 @@
2725
import com.duy.ccppcompiler.R;
2826

2927
import java.io.File;
30-
import java.io.IOException;
3128
import java.util.ArrayList;
3229
import java.util.HashMap;
3330
import java.util.List;
@@ -371,76 +368,4 @@ public void onClick(DialogInterface dialog, int which) {
371368
}
372369
}
373370

374-
private class ActionFiles extends AsyncTask<List<String>, String, Boolean> {
375-
protected void onPreExecute() {
376-
super.onPreExecute();
377-
progressDialog = new ProgressDialog(context);
378-
progressDialog.setMessage("...");
379-
progressDialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL);
380-
progressDialog.setCancelable(false);
381-
progressDialog.show();
382-
}
383-
384-
protected void onProgressUpdate(String... value) {
385-
super.onProgressUpdate(value);
386-
String message = "";
387-
if (actionOp == R.id.file_copy) {
388-
message = getString(R.string.message_file_copy);
389-
390-
} else if (actionOp == R.id.file_cut) {
391-
message = getString(R.string.message_file_move);
392-
393-
} else if (actionOp == R.id.file_delete) {
394-
message = getString(R.string.message_file_delete);
395-
396-
}
397-
progressDialog.setMessage(message + " " + (new File(value[0])).getName());
398-
progressDialog.setProgress(Integer.parseInt(value[1]));
399-
progressDialog.setMax(Integer.parseInt(value[2]));
400-
}
401-
402-
protected Boolean doInBackground(List<String>... params) {
403-
int max = params[0].size();
404-
int count = 0;
405-
for (String file : params[0]) {
406-
try {
407-
publishProgress(file, String.valueOf(++count), String.valueOf(max));
408-
if (actionOp == R.id.file_copy || actionOp == R.id.file_cut) {
409-
Log.i(TAG, "Copy " + file + " to " + currentPath);
410-
if (new File(currentPath + "/" + (new File(file).getName())).getCanonicalPath()
411-
.startsWith(new File(file).getCanonicalPath())) {
412-
Log.e(TAG, "Cannot copy a directory, '" + file + "', into itself.");
413-
continue;
414-
}
415-
Utils.copyDirectory(new File(file), new File(currentPath + "/" + (new File(file).getName())));
416-
}
417-
if (actionOp == R.id.file_cut || actionOp == R.id.file_delete) {
418-
Log.i(TAG, "Delete " + file);
419-
Utils.deleteDirectory(new File(file));
420-
}
421-
} catch (IOException e) {
422-
Log.e(TAG, "IOException " + e);
423-
return false;
424-
}
425-
}
426-
return true;
427-
}
428-
429-
protected void onPostExecute(final Boolean result) {
430-
actionOp = 0;
431-
actionFiles = null;
432-
if (progressDialog.isShowing()) {
433-
progressDialog.dismiss();
434-
}
435-
try {
436-
if (mMode != null) {
437-
mMode.wait();
438-
}
439-
} catch (InterruptedException e) {
440-
Log.e(TAG, "ActionFiles onPostExecute Interrupted Exception " + e);
441-
}
442-
getDir(currentPath);
443-
}
444-
}
445-
446371
}

‎app/src/main/res/values/ids.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
<item name="action_premium" type="id" />
2626
<item name="action_editor_color_scheme" type="id" />
2727
<item name="action_build_native_activity" type="id" />
28-
<item name="action_build_sdl_activity" type="id" />
2928
<item name="action_run_sdl_activity" type="id" />
3029

3130
</resources>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@
3737
<string name="pref_option_wextra_warning">pref_option_wextra_warning</string>
3838
<string name="pref_option_werror">pref_option_werror</string>
3939
<string name="build_native_activity">Build native activity</string>
40-
<string name="build_sdl_activity">Build SDL activity</string>
4140
<string name="pref_ld_opts">Linker options (LDFLAGS)</string>
4241
<string name="title_compiler_options">Compiler options</string>
4342
<string name="run_sdl_activity">Run SDL activity</string>
43+
<string name="build">Build</string>
4444

4545
</resources>

0 commit comments

Comments
 (0)