integrate diagnostic view

Author: tranleduy2000

app/src/main/java/com/duy/ccppcompiler/diagnostic/DiagnosticContract.java

@@ -33,6 +33,8 @@ public static interface View {
         void add(Diagnostic diagnostic);
 
         void clear();
+
+        void setPresenter(Presenter presenter);
     }
 
     public interface Presenter {

app/src/main/java/com/duy/ccppcompiler/diagnostic/DiagnosticPresenter.java

@@ -17,7 +17,6 @@
 package com.duy.ccppcompiler.diagnostic;
 
 import android.support.annotation.MainThread;
-import android.support.v7.widget.RecyclerView;
 import android.view.View;
 
 import com.duy.ccppcompiler.compiler.diagnostic.Diagnostic;
@@ -31,16 +30,18 @@
  */
 
 public class DiagnosticPresenter implements DiagnosticContract.Presenter {
-    private final RecyclerView mRecyclerView;
     private final EditorActivity mActivity;
     private final TabManager mTabManager;
     private ArrayList<Diagnostic> diagnostics;
     private DiagnosticContract.View mView;
 
-    public DiagnosticPresenter(RecyclerView recyclerView, EditorActivity activity, TabManager tabManager) {
-        this.mRecyclerView = recyclerView;
-        this.mActivity = activity;
-        this.mTabManager = tabManager;
+    public DiagnosticPresenter(DiagnosticContract.View view, EditorActivity activity, TabManager tabManager) {
+        mActivity = activity;
+        mTabManager = tabManager;
+        mView = view;
+        if (mView != null) {
+            mView.setPresenter(this);
+        }
     }
 
     @MainThread

app/src/main/java/com/duy/ccppcompiler/diagnostic/DiagnosticView.java

@@ -36,10 +36,9 @@ public class DiagnosticView implements DiagnosticContract.View, DiagnosticClickL
     private DiagnosticContract.Presenter mPresenter;
     private DiagnosticAdapter mAdapter;
 
-    public DiagnosticView(RecyclerView recyclerView, Context context, DiagnosticContract.Presenter presenter) {
+    public DiagnosticView(RecyclerView recyclerView, Context context) {
         this.mRecyclerView = recyclerView;
         this.mContext = context;
-        mPresenter = presenter;
         init();
     }
 
@@ -75,8 +74,15 @@ public void clear() {
         mAdapter.clear();
     }
 
+    @Override
+    public void setPresenter(DiagnosticContract.Presenter presenter) {
+        mPresenter = presenter;
+    }
+
     @Override
     public void onDiagnosisClick(Diagnostic diagnostic, View view) {
-        mPresenter.onDiagnosticClick(view, diagnostic);
+        if (mPresenter != null) {
+            mPresenter.onDiagnosticClick(view, diagnostic);
+        }
     }
 }

app/src/main/java/com/jecelyin/editor/v2/ui/activities/EditorActivity.java

@@ -47,6 +47,7 @@
 import com.duy.ccppcompiler.compiler.CompileManager;
 import com.duy.ccppcompiler.compiler.CompilerFactory;
 import com.duy.ccppcompiler.diagnostic.DiagnosticPresenter;
+import com.duy.ccppcompiler.diagnostic.DiagnosticView;
 import com.duy.ide.compiler.CompileTask;
 import com.duy.ide.compiler.INativeCompiler;
 import com.duy.ide.filemanager.FileManager;
@@ -106,14 +107,14 @@ public class EditorActivity extends FullScreenActivity
     public TextView mVersionTextView;
     public SymbolBarLayout mSymbolBarLayout;
 
-    private TabManager tabManager;
+    private TabManager mTabManager;
 
     private Preferences preferences;
     private ClusterCommand clusterCommand;
     private MenuManager mMenuManager;
     private long mExitTime;
     private SlidingUpPanelLayout mSlidingUpPanelLayout;
-    private DiagnosticPresenter diagnosticPresenter;
+    private DiagnosticPresenter mDiagnosticPresenter;
 
     @Override
     protected void onRestoreInstanceState(Bundle savedInstanceState) {
@@ -242,6 +243,10 @@ public void onPanelSlide(View panel, float slideOffset) {
                 toggleView.animate().rotation(180 * slideOffset).start();
             }
         });
+
+        RecyclerView recyclerView = findViewById(R.id.diagnostic_list_view);
+        DiagnosticView diagnosticView = new DiagnosticView(recyclerView, this);
+        mDiagnosticPresenter = new DiagnosticPresenter(diagnosticView, this, mTabManager);
     }
 
     private void initToolbar() {
@@ -263,7 +268,7 @@ private void initToolbar() {
         menuItem.setOnMenuItemClickListener(this);
         menuItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
 
-        tabManager = new TabManager(this);
+        mTabManager = new TabManager(this);
     }
 
     @Override
@@ -483,7 +488,7 @@ public void onSaved() {
                 CompilerFactory.CompileType compileType = CompilerFactory.CompileType.GCC;
                 INativeCompiler compiler = CompilerFactory.createCompiler(EditorActivity.this, compileType);
                 CompileManager compileManager = new CompileManager(EditorActivity.this);
-                compileManager.setDiagnosticPresenter(diagnosticPresenter);
+                compileManager.setDiagnosticPresenter(mDiagnosticPresenter);
 
                 CompileTask compileTask = new CompileTask(compiler, srcFiles, compileManager);
                 compileTask.execute();
@@ -520,7 +525,7 @@ private void showSoftInput() {
     }
 
     public void doClusterCommand(Command command) {
-        clusterCommand = tabManager.getEditorPagerAdapter().makeClusterCommand();
+        clusterCommand = mTabManager.getEditorPagerAdapter().makeClusterCommand();
         clusterCommand.setCommand(command);
         clusterCommand.doNextCommand();
     }
@@ -545,9 +550,9 @@ public void doCommand(Command command) {
     }
 
     private EditorDelegate getCurrentEditorDelegate() {
-        if (tabManager == null || tabManager.getEditorPagerAdapter() == null)
+        if (mTabManager == null || mTabManager.getEditorPagerAdapter() == null)
             return null;
-        return tabManager.getEditorPagerAdapter().getCurrentEditorDelegate();
+        return mTabManager.getEditorPagerAdapter().getCurrentEditorDelegate();
     }
 
     public void startPickPathActivity(String path, String encoding) {
@@ -570,7 +575,7 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
                 String file = FileExplorerActivity.getFile(data);
                 String encoding = FileExplorerActivity.getFileEncoding(data);
 
-                IEditorPagerAdapter adapter = tabManager.getEditorPagerAdapter();
+                IEditorPagerAdapter adapter = mTabManager.getEditorPagerAdapter();
                 EditorDelegate delegate = adapter.getCurrentEditorDelegate();
                 if (delegate != null) {
                     adapter.updateDescriptor(file, encoding);
@@ -588,7 +593,7 @@ private void openText(CharSequence content) {
         FileManager fileManager = new FileManager(this);
         File newFile = fileManager.createNewFile("_" + System.currentTimeMillis() + ".txt");
         if (IOUtils.writeFile(newFile, content.toString())) {
-            tabManager.newTab(newFile);
+            mTabManager.newTab(newFile);
         }
     }
 
@@ -611,7 +616,7 @@ public void openFile(String filePath, String encoding, int offset) {
             return;
         }
 
-        if (!tabManager.newTab(file, offset, encoding)) {
+        if (!mTabManager.newTab(file, offset, encoding)) {
             return;
         }
         DBHelper.getInstance(this).addRecentFile(filePath, encoding);
@@ -626,7 +631,7 @@ public void insertText(CharSequence text) {
     }
 
     public TabManager getTabManager() {
-        return tabManager;
+        return mTabManager;
     }
 
     @Override
@@ -647,7 +652,7 @@ public boolean onKeyDown(int keyCode, KeyEvent event) {
                 mExitTime = System.currentTimeMillis();
                 return true;
             } else {
-                return tabManager == null || tabManager.closeAllTabAndExitApp();
+                return mTabManager == null || mTabManager.closeAllTabAndExitApp();
             }
         }
         return super.onKeyDown(keyCode, event);