refactor code

tranleduy2000 · tranleduy2000 · commit e31eee29d3f2 · 2018-05-29T17:34:25.000+07:00
diff --git a/app/src/main/java/com/duy/ccppcompiler/compiler/CompileManager.java b/app/src/main/java/com/duy/ccppcompiler/compiler/CompileManager.java
@@ -18,7 +18,7 @@
 
 import android.content.Intent;
 
-import com.duy.ccppcompiler.compiler.shell.GccCommandResult;
+import com.duy.ccppcompiler.compiler.shell.GccCompileResult;
 import com.duy.ccppcompiler.console.TermActivity;
 import com.duy.editor.CodeEditorActivity;
 import com.pdaxrom.cctools.BuildConstants;
@@ -29,14 +29,14 @@
  * Created by Duy on 25-Apr-18.
  */
 
-public class CompileManager extends CompileManagerImpl<GccCommandResult> {
+public class CompileManager extends CompileManagerImpl<GccCompileResult> {
 
     public CompileManager(CodeEditorActivity activity) {
         super(activity);
     }
 
     @Override
-    public void onCompileSuccess(GccCommandResult commandResult) {
+    public void onCompileSuccess(GccCompileResult commandResult) {
         super.onCompileSuccess(commandResult);
 
         //now run binary file
diff --git a/app/src/main/java/com/duy/ccppcompiler/compiler/CompileManagerImpl.java b/app/src/main/java/com/duy/ccppcompiler/compiler/CompileManagerImpl.java
@@ -23,7 +23,7 @@
 import android.widget.Toast;
 
 import com.duy.ccppcompiler.R;
-import com.duy.ccppcompiler.compiler.compilers.INativeCompiler;
+import com.duy.ccppcompiler.compiler.compilers.ICompiler;
 import com.duy.ccppcompiler.compiler.shell.CommandResult;
 import com.duy.ide.Diagnostic;
 import com.duy.ide.DiagnosticPresenter;
@@ -48,7 +48,7 @@ public abstract class CompileManagerImpl<T extends CommandResult> implements ICo
     private ProgressDialog mCompileDialog;
     @Nullable
     private DiagnosticPresenter mDiagnosticPresenter;
-    private INativeCompiler mCompiler;
+    private ICompiler mCompiler;
 
     CompileManagerImpl(@NonNull CodeEditorActivity activity) {
         mActivity = activity;
@@ -124,7 +124,7 @@ private void hideDialog() {
         }
     }
 
-    public void setCompiler(INativeCompiler compiler) {
+    public void setCompiler(ICompiler compiler) {
         this.mCompiler = compiler;
     }
 }
diff --git a/app/src/main/java/com/duy/ccppcompiler/compiler/CompileTask.java b/app/src/main/java/com/duy/ccppcompiler/compiler/CompileTask.java
@@ -20,7 +20,7 @@
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 
-import com.duy.ccppcompiler.compiler.compilers.INativeCompiler;
+import com.duy.ccppcompiler.compiler.compilers.ICompiler;
 import com.duy.ccppcompiler.compiler.shell.CommandResult;
 import com.duy.common.DLog;
 
@@ -33,13 +33,13 @@
 public class CompileTask extends AsyncTask<Void, Void, CommandResult> {
     private static final String TAG = "CompileTask";
     @NonNull
-    private INativeCompiler mCompiler;
+    private ICompiler mCompiler;
     @NonNull
     private File[] mFiles;
     @Nullable
     private ICompileManager mCompileManager;
 
-    public CompileTask(@NonNull INativeCompiler compiler,
+    public CompileTask(@NonNull ICompiler compiler,
                        @NonNull File[] files,
                        @Nullable ICompileManager compileManager) {
         mCompiler = compiler;
diff --git a/app/src/main/java/com/duy/ccppcompiler/compiler/compilers/CompilerFactory.java b/app/src/main/java/com/duy/ccppcompiler/compiler/compilers/CompilerFactory.java
@@ -25,19 +25,23 @@
 
 import java.io.File;
 
+import static com.duy.ccppcompiler.compiler.compilers.CompilerFactory.CompileType.NATIVE_ACTIVITY;
+
 /**
  * Created by Duy on 25-Apr-18.
  */
 
 public class CompilerFactory {
     @Nullable
-    public static INativeCompiler getCompilerForFile(Context context, File[] sourceFiles) {
+    public static ICompiler getCompilerForFile(Context context, File[] sourceFiles, boolean nativeActivity) {
         File file = sourceFiles[0];
         String filePath = file.getAbsolutePath();
         String fileName = file.getName();
 
         CompilerFactory.CompileType compilerType = CompileType.NONE;
-        if (Catalog.getModeByName("C++").acceptFile(filePath, fileName)) {
+        if (nativeActivity) {
+            compilerType = NATIVE_ACTIVITY;
+        } else if (Catalog.getModeByName("C++").acceptFile(filePath, fileName)) {
             compilerType = CompilerFactory.CompileType.G_PLUS_PLUS;
 
         } else if (Catalog.getModeByName("C").acceptFile(filePath, fileName)) {
@@ -48,8 +52,13 @@ public static INativeCompiler getCompilerForFile(Context context, File[] sourceF
         switch (compilerType) {
             case G_PLUS_PLUS:
                 return new GPlusPlusCompiler(context, new CompileSetting(context));
+
             case GCC:
                 return new GCCCompiler(context, new CompileSetting(context));
+
+            case NATIVE_ACTIVITY:
+                return new NativeActivityCompiler(context, new CompileSetting(context));
+
             default:
                 return null;
         }
@@ -60,6 +69,6 @@ public static INativeCompiler getCompilerForFile(Context context, File[] sourceF
      */
 
     public enum CompileType {
-        GCC, G_PLUS_PLUS, NONE
+        GCC, G_PLUS_PLUS, NATIVE_ACTIVITY, NONE
     }
 }
diff --git a/app/src/main/java/com/duy/ccppcompiler/compiler/compilers/CompilerImpl.java b/app/src/main/java/com/duy/ccppcompiler/compiler/compilers/CompilerImpl.java
@@ -25,7 +25,7 @@
 /**
  * Created by Duy on 18-May-18.
  */
-public abstract class NativeCompilerImpl<T extends CommandResult> implements INativeCompiler<T> {
+public abstract class CompilerImpl<T extends CommandResult> implements ICompiler<T> {
     private static final String TAG = "NativeCompilerImpl";
 
     @NonNull
diff --git a/app/src/main/java/com/duy/ccppcompiler/compiler/compilers/GCCCompiler.java b/app/src/main/java/com/duy/ccppcompiler/compiler/compilers/GCCCompiler.java
@@ -22,7 +22,7 @@
 
 import com.duy.ccppcompiler.compiler.ICompileSetting;
 import com.duy.ccppcompiler.compiler.shell.CommandBuilder;
-import com.duy.ccppcompiler.compiler.shell.GccCommandResult;
+import com.duy.ccppcompiler.compiler.shell.GccCompileResult;
 import com.duy.ccppcompiler.packagemanager.Environment;
 import com.pdaxrom.utils.Utils;
 
@@ -36,7 +36,7 @@
  * Created by Duy on 25-Apr-18.
  */
 
-public class GCCCompiler extends NativeCompilerImpl<GccCommandResult> {
+public class GCCCompiler extends CompilerImpl<GccCompileResult> {
     private static final String TAG = "GCCCompiler";
     private static final String COMPILER_NAME = "gcc-4.9";
     protected File mOutFile;
@@ -50,11 +50,11 @@ public GCCCompiler(Context context, @Nullable ICompileSetting compileSetting) {
     }
 
     @Override
-    public GccCommandResult compile(File[] sourceFiles) {
+    public GccCompileResult compile(File[] sourceFiles) {
         File sourceFile = sourceFiles[0];
         String command = buildCommand(sourceFiles);
 
-        GccCommandResult result = new GccCommandResult(execCommand(mContext, sourceFile.getParent(), command));
+        GccCompileResult result = new GccCompileResult(execCommand(mContext, sourceFile.getParent(), command));
         if (result.getResultCode() == 0) {
             if (mOutFile.exists()) {
                 try {
diff --git a/app/src/main/java/com/duy/ccppcompiler/compiler/compilers/GPlusPlusCompiler.java b/app/src/main/java/com/duy/ccppcompiler/compiler/compilers/GPlusPlusCompiler.java
@@ -21,7 +21,7 @@
 
 import com.duy.ccppcompiler.compiler.ICompileSetting;
 import com.duy.ccppcompiler.compiler.shell.CommandBuilder;
-import com.duy.ccppcompiler.compiler.shell.GccCommandResult;
+import com.duy.ccppcompiler.compiler.shell.GccCompileResult;
 
 import java.io.File;
 
@@ -37,7 +37,7 @@ public GPlusPlusCompiler(Context context, ICompileSetting compileSetting) {
     }
 
     @Override
-    public GccCommandResult compile(File[] sourceFiles) {
+    public GccCompileResult compile(File[] sourceFiles) {
         return super.compile(sourceFiles);
     }
 
diff --git a/app/src/main/java/com/duy/ccppcompiler/compiler/compilers/ICompiler.java b/app/src/main/java/com/duy/ccppcompiler/compiler/compilers/ICompiler.java
@@ -26,7 +26,7 @@
  * Created by Duy on 25-Apr-18.
  */
 
-public interface INativeCompiler<T extends CommandResult> {
+public interface ICompiler<T extends CommandResult> {
     @WorkerThread
     T compile(File[] sourceFiles) ;
 
diff --git a/app/src/main/java/com/duy/ccppcompiler/compiler/compilers/MakeCompiler.java b/app/src/main/java/com/duy/ccppcompiler/compiler/compilers/MakeCompiler.java
@@ -20,5 +20,5 @@
  * Created by Duy on 18-May-18.
  */
 
-public class MakefileCompiler {
+public class MakeCompiler {
 }
diff --git a/app/src/main/java/com/duy/ccppcompiler/compiler/shell/GccCompileResult.java b/app/src/main/java/com/duy/ccppcompiler/compiler/shell/GccCompileResult.java
@@ -24,11 +24,11 @@
  * Created by Duy on 18-May-18.
  */
 
-public class GccCommandResult extends CommandResult {
+public class GccCompileResult extends CommandResult {
     @Nullable
     private File binaryFile;
 
-    public GccCommandResult(CommandResult commandResult) {
+    public GccCompileResult(CommandResult commandResult) {
         super(commandResult);
     }
 
diff --git a/app/src/main/java/com/duy/ccppcompiler/compiler/shell/NativeActivityCompileResult.java b/app/src/main/java/com/duy/ccppcompiler/compiler/shell/NativeActivityCompileResult.java
@@ -0,0 +1,21 @@
+package com.duy.ccppcompiler.compiler.shell;
+
+import android.support.annotation.Nullable;
+
+/**
+ * Commnad result when build native activity
+ */
+public class NativeActivityCompileResult extends CommandResult {
+
+    public NativeActivityCompileResult(int resultCode) {
+        super(resultCode);
+    }
+
+    public NativeActivityCompileResult(int resultCode, @Nullable String message) {
+        super(resultCode, message);
+    }
+
+    public NativeActivityCompileResult(CommandResult commandResult) {
+        super(commandResult);
+    }
+}
diff --git a/app/src/main/java/com/duy/ccppcompiler/ui/InstallActivity.java b/app/src/main/java/com/duy/ccppcompiler/ui/InstallActivity.java
@@ -36,7 +36,7 @@
 import com.duy.ccppcompiler.R;
 import com.duy.ccppcompiler.compiler.compilers.GCCCompiler;
 import com.duy.ccppcompiler.compiler.compilers.GPlusPlusCompiler;
-import com.duy.ccppcompiler.compiler.shell.GccCommandResult;
+import com.duy.ccppcompiler.compiler.shell.GccCompileResult;
 import com.duy.ccppcompiler.packagemanager.PackageManagerActivity;
 import com.duy.common.DLog;
 import com.duy.editor.CodeEditorActivity;
@@ -193,7 +193,7 @@ protected Boolean doInBackground(Void... voids) {
                 output.close();
 
                 GCCCompiler compiler = new GCCCompiler(context, null);
-                GccCommandResult result = compiler.compile(new File[]{file});
+                GccCompileResult result = compiler.compile(new File[]{file});
                 if (result == null || result.getResultCode() != 0) {
                     publishProgress("Could not exec C compiler, please install compiler");
                     return false;
diff --git a/app/src/main/java/com/duy/editor/CodeEditorActivity.java b/app/src/main/java/com/duy/editor/CodeEditorActivity.java
@@ -29,7 +29,7 @@
 import com.duy.ccppcompiler.compiler.CompileManager;
 import com.duy.ccppcompiler.compiler.CompilerSettingActivity;
 import com.duy.ccppcompiler.compiler.compilers.CompilerFactory;
-import com.duy.ccppcompiler.compiler.compilers.INativeCompiler;
+import com.duy.ccppcompiler.compiler.compilers.ICompiler;
 import com.duy.ccppcompiler.console.TermActivity;
 import com.duy.ccppcompiler.packagemanager.Environment;
 import com.duy.ccppcompiler.packagemanager.PackageManagerActivity;
@@ -90,6 +90,8 @@ protected void onCreateNavigationMenu(Menu menu) {
         menu.add(MenuDef.GROUP_NAVIGATION, R.id.action_editor_color_scheme, 0, R.string.editor_theme)
                 .setIcon(R.drawable.ic_color_lens_white_24dp);
 
+        menu.add(MenuDef.GROUP_NAVIGATION, R.id.action_build_native_activity, 0, R.string.build_native_activity);
+
         SubMenu codeMenu = menu.addSubMenu(R.string.code);
         codeMenu.add(MenuDef.GROUP_NAVIGATION, R.id.action_c_example, 0, R.string.title_menu_c_example)
                 .setIcon(R.drawable.ic_code_black_24dp);
@@ -128,7 +130,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
                 return true;
 
             case R.id.action_run:
-                compileAndRun();
+                compileAndRun(false);
                 return true;
 
             case R.id.action_term_preferences:
@@ -153,18 +155,17 @@ public boolean onOptionsItemSelected(MenuItem item) {
             case R.id.action_editor_color_scheme:
                 startActivity(new Intent(this, ThemeActivity.class));
                 break;
+
+            case R.id.action_build_native_activity:
+                compileAndRun(true);
+                break;
         }
         return super.onOptionsItemSelected(item);
     }
 
-    private void clickUpgrade() {
-        PremiumDialog dialog = new PremiumDialog(this, mPremiumHelper);
-        dialog.show();
-    }
-
-    private void compileAndRun() {
-        SaveAllTask saveAllTask = new SaveAllTask(this, new SaveListener() {
 
+    private void compileAndRun(final boolean nativeActivity) {
+        SaveListener saveListener = new SaveListener() {
             @Override
             public void onSaveFailed(Exception e) {
                 UIUtils.alert(CodeEditorActivity.this, e.getMessage());
@@ -183,21 +184,21 @@ public void onSavedSuccess() {
                 srcFiles[0] = new File(path);
 
                 CodeEditorActivity activity = CodeEditorActivity.this;
-
-                INativeCompiler compiler = CompilerFactory.getCompilerForFile(activity, srcFiles);
-                CompileManager compileManager = new CompileManager(activity);
-                compileManager.setDiagnosticPresenter(mDiagnosticPresenter);
-                compileManager.setCompiler(compiler);
-
+                ICompiler compiler = CompilerFactory.getCompilerForFile(activity, srcFiles, nativeActivity);
                 if (compiler != null) {
+                    CompileManager compileManager = new CompileManager(activity);
+                    compileManager.setDiagnosticPresenter(mDiagnosticPresenter);
+                    compileManager.setCompiler(compiler);
+
                     compileManager.compile(srcFiles);
                 } else {
                     Toast.makeText(activity, R.string.unknown_filetype, Toast.LENGTH_SHORT).show();
                 }
             }
 
 
-        });
+        };
+        SaveAllTask saveAllTask = new SaveAllTask(this, saveListener);
         saveAllTask.execute();
 
     }
@@ -227,6 +228,11 @@ private void openTerminal() {
         startActivity(intent);
     }
 
+    private void clickUpgrade() {
+        PremiumDialog dialog = new PremiumDialog(this, mPremiumHelper);
+        dialog.show();
+    }
+
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
diff --git a/app/src/main/java/com/pdaxrom/cctools/BuildActivity.java b/app/src/main/java/com/pdaxrom/cctools/BuildActivity.java
@@ -99,11 +99,11 @@ public void onCreate(Bundle savedInstanceState) {
                     return;
 
                 } else if (Catalog.getModeByName("C").acceptFile(mFilePath, fileName)) {
-                    mCommand = "gcc-4.9 " + fileName;
+                    mCommand = "gcc " + fileName;
                     mCommand += " " + mPrefs.getString("force_ccopts", "");
 
                 } else if (Catalog.getModeByName("C++").acceptFile(mFilePath, fileName)) {
-                    mCommand = "g++-4.9 " + fileName;
+                    mCommand = "g++ " + fileName;
                     mCommand += " " + mPrefs.getString("force_cxxopts", "");
 
                 } else if ((ext.contentEquals(".f") || ext.contentEquals(".f90") || ext.contentEquals(".f95")
diff --git a/app/src/main/res/values/ids.xml b/app/src/main/res/values/ids.xml
@@ -25,5 +25,6 @@
     <item name="action_compiler_setting" type="id" />
     <item name="action_premium" type="id" />
     <item name="action_editor_color_scheme" type="id" />
+    <item name="action_build_native_activity" type="id" />
 
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -36,5 +36,6 @@
     <string name="pref_option_w_warning">pref_option_w_warning</string>
     <string name="pref_option_wextra_warning">pref_option_wextra_warning</string>
     <string name="pref_option_werror">pref_option_werror</string>
+    <string name="build_native_activity">Build native activity</string>
 
 </resources>

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@`
`23`	`23`	`import android.widget.Toast;`
`24`	`24`
`25`	`25`	`import com.duy.ccppcompiler.R;`
`26`		`-import com.duy.ccppcompiler.compiler.compilers.INativeCompiler;`
	`26`	`+import com.duy.ccppcompiler.compiler.compilers.ICompiler;`
`27`	`27`	`import com.duy.ccppcompiler.compiler.shell.CommandResult;`
`28`	`28`	`import com.duy.ide.Diagnostic;`
`29`	`29`	`import com.duy.ide.DiagnosticPresenter;`
`@@ -48,7 +48,7 @@ public abstract class CompileManagerImpl<T extends CommandResult> implements ICo`
`48`	`48`	`private ProgressDialog mCompileDialog;`
`49`	`49`	`@Nullable`
`50`	`50`	`private DiagnosticPresenter mDiagnosticPresenter;`
`51`		`- private INativeCompiler mCompiler;`
	`51`	`+ private ICompiler mCompiler;`
`52`	`52`
`53`	`53`	`CompileManagerImpl(@NonNull CodeEditorActivity activity) {`
`54`	`54`	`mActivity = activity;`
`@@ -124,7 +124,7 @@ private void hideDialog() {`
`124`	`124`	`}`
`125`	`125`	`}`
`126`	`126`
`127`		`- public void setCompiler(INativeCompiler compiler) {`
	`127`	`+ public void setCompiler(ICompiler compiler) {`
`128`	`128`	`this.mCompiler = compiler;`
`129`	`129`	`}`
`130`	`130`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@`
`21`	`21`
`22`	`22`	`import com.duy.ccppcompiler.compiler.ICompileSetting;`
`23`	`23`	`import com.duy.ccppcompiler.compiler.shell.CommandBuilder;`
`24`		`-import com.duy.ccppcompiler.compiler.shell.GccCommandResult;`
	`24`	`+import com.duy.ccppcompiler.compiler.shell.GccCompileResult;`
`25`	`25`
`26`	`26`	`import java.io.File;`
`27`	`27`
`@@ -37,7 +37,7 @@ public GPlusPlusCompiler(Context context, ICompileSetting compileSetting) {`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`@Override`
`40`		`- public GccCommandResult compile(File[] sourceFiles) {`
	`40`	`+ public GccCompileResult compile(File[] sourceFiles) {`
`41`	`41`	`return super.compile(sourceFiles);`
`42`	`42`	`}`
`43`	`43`
Original file line number	Diff line number	Diff line change
`@@ -20,5 +20,5 @@`
`20`	`20`	`* Created by Duy on 18-May-18.`
`21`	`21`	`*/`
`22`	`22`
`23`		`-public class MakefileCompiler {`
	`23`	`+public class MakeCompiler {`
`24`	`24`	`}`