Skip to content

Commit 7b06eaf

Browse files
committed
Improve check system file
1 parent 4d26c00 commit 7b06eaf

29 files changed

+104
-98
lines changed

app/src/main/AndroidManifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
android:theme="@style/AppTheme">
1818

1919
<activity
20-
android:name=".filemanager.install.InstallActivity"
20+
android:name=".ui.InstallActivity"
2121
android:configChanges="orientation|screenSize">
2222
<intent-filter>
2323
<action android:name="android.intent.action.MAIN" />

app/src/main/java/com/duy/ccppcompiler/compiler/CompileManagerImpl.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@
2525
import com.duy.ccppcompiler.R;
2626
import com.duy.ccppcompiler.compiler.compilers.INativeCompiler;
2727
import com.duy.ccppcompiler.compiler.shell.CommandResult;
28-
import com.duy.ccppcompiler.diagnostic.Diagnostic;
29-
import com.duy.ccppcompiler.diagnostic.DiagnosticPresenter;
30-
import com.duy.ccppcompiler.diagnostic.DiagnosticsCollector;
31-
import com.duy.ccppcompiler.diagnostic.OutputParser;
28+
import com.duy.ide.Diagnostic;
29+
import com.duy.ide.DiagnosticPresenter;
30+
import com.duy.ide.DiagnosticsCollector;
31+
import com.duy.ccppcompiler.compiler.shell.OutputParser;
3232
import com.duy.common.DLog;
3333
import com.duy.editor.CodeEditorActivity;
3434
import com.duy.ide.editor.SimpleEditorActivity;

app/src/main/java/com/duy/ccppcompiler/diagnostic/OutputParser.java renamed to app/src/main/java/com/duy/ccppcompiler/compiler/shell/OutputParser.java

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,19 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.duy.ccppcompiler.diagnostic;
17+
package com.duy.ccppcompiler.compiler.shell;
18+
19+
import com.duy.ide.Diagnostic;
20+
import com.duy.ide.DiagnosticFactory;
21+
import com.duy.ide.DiagnosticsCollector;
22+
import com.duy.ide.Kind;
1823

1924
import java.io.LineNumberReader;
2025
import java.io.StringReader;
2126
import java.util.regex.Matcher;
2227
import java.util.regex.Pattern;
2328

24-
import static com.duy.ccppcompiler.diagnostic.Kind.OTHER;
29+
import static com.duy.ide.Kind.OTHER;
2530

2631
/**
2732
* https://gcc.gnu.org/onlinedocs/gcc-3.3.5/gnat_ug_unx/Output-and-Error-Message-Control.html
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.duy.ccppcompiler.filemanager.install;
17+
package com.duy.ccppcompiler.ui;
1818

1919
import android.Manifest;
2020
import android.annotation.SuppressLint;

app/src/main/java/com/duy/common/io/IoUtils.java renamed to app/src/main/java/com/duy/common/io/IOUtils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
* Created by Duy on 12-Apr-18.
2828
*/
2929

30-
public class IoUtils {
30+
public class IOUtils {
3131

3232
public static String toString(InputStream inputStream) throws IOException {
3333
final int bufferSize = 1024;

app/src/main/java/com/duy/common/purchase/PremiumFileUtil.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import android.support.annotation.NonNull;
2121
import android.support.annotation.Nullable;
2222

23-
import com.duy.common.io.IoUtils;
23+
import com.duy.common.io.IOUtils;
2424

2525
import java.io.File;
2626
import java.io.FileInputStream;
@@ -41,7 +41,7 @@ class PremiumFileUtil {
4141
private static String readFile(File file) {
4242
try {
4343
FileInputStream inputStream = new FileInputStream(file);
44-
String result = IoUtils.toString(inputStream);
44+
String result = IOUtils.toString(inputStream);
4545
inputStream.close();
4646
return result;
4747
} catch (IOException e) {

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

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,9 @@
1919
import android.content.Intent;
2020
import android.core.widget.EditAreaView;
2121
import android.os.Bundle;
22-
import android.support.v4.app.FragmentManager;
2322
import android.view.Menu;
2423
import android.view.MenuItem;
2524
import android.view.SubMenu;
26-
import android.view.View;
2725
import android.widget.Toast;
2826

2927
import com.duy.ccppcompiler.BuildConfig;
@@ -33,8 +31,6 @@
3331
import com.duy.ccppcompiler.compiler.compilers.CompilerFactory;
3432
import com.duy.ccppcompiler.compiler.compilers.INativeCompiler;
3533
import com.duy.ccppcompiler.console.TermActivity;
36-
import com.duy.ccppcompiler.diagnostic.DiagnosticPresenter;
37-
import com.duy.ccppcompiler.diagnostic.ui.DiagnosticFragment;
3834
import com.duy.ccppcompiler.packagemanager.Environment;
3935
import com.duy.ccppcompiler.packagemanager.PackageManagerActivity;
4036
import com.duy.ccppcompiler.ui.dialogs.PremiumDialog;
@@ -65,36 +61,13 @@
6561
public class CodeEditorActivity extends SimpleEditorActivity {
6662
private static final String TAG = "CodeEditorActivity";
6763

68-
public SlidingUpPanelLayout mSlidingUpPanelLayout;
69-
private DiagnosticPresenter mDiagnosticPresenter;
7064
private InAppPurchaseHelper mPremiumHelper;
7165

7266
@Override
7367
protected void onCreate(Bundle savedInstanceState) {
7468
super.onCreate(savedInstanceState);
7569
mPremiumHelper = new InAppPurchaseHelper(this);
7670

77-
final View toggleView = findViewById(R.id.btn_toggle_panel);
78-
mSlidingUpPanelLayout = findViewById(R.id.diagnostic_panel);
79-
mSlidingUpPanelLayout.addPanelSlideListener(new SlidingUpPanelLayout.SimplePanelSlideListener() {
80-
@Override
81-
public void onPanelSlide(View panel, float slideOffset) {
82-
toggleView.animate().rotation(180 * slideOffset).start();
83-
}
84-
});
85-
86-
87-
FragmentManager fm = getSupportFragmentManager();
88-
String tag = DiagnosticFragment.class.getSimpleName();
89-
DiagnosticFragment diagnosticFragment = (DiagnosticFragment) fm.findFragmentByTag(tag);
90-
if (diagnosticFragment == null) {
91-
diagnosticFragment = DiagnosticFragment.newInstance();
92-
}
93-
fm.beginTransaction()
94-
.replace(R.id.container_diagnostic_list_view, diagnosticFragment, tag)
95-
.commit();
96-
mDiagnosticPresenter = new DiagnosticPresenter(diagnosticFragment, this, mTabManager);
97-
9871
// Monitor launch times and interval from installation
9972
RateThisApp.onCreate(this);
10073
}
@@ -196,7 +169,6 @@ private void compileAndRun() {
196169
@Override
197170
public void onSaveFailed(Exception e) {
198171
UIUtils.alert(CodeEditorActivity.this, e.getMessage());
199-
mDiagnosticPresenter.log(e.getMessage());
200172
}
201173

202174
@Override

app/src/main/res/values/dimens.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<resources>
3-
<dimen name="smallest_text_size">12sp</dimen>
43
</resources>

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

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,9 @@
1414
<string name="title_menu_cpp_example">C++ examples</string>
1515
<string name="title_term_preferences">Terminal Setting</string>
1616

17-
<string name="compiling">Compiling…</string>
18-
<string name="diagnostic">Diagnostic</string>
19-
<string name="compiler_output">Compiler output</string>
2017
<string name="compiler_setting">Compiler setting</string>
2118
<string name="message_program_finished">Program finished</string>
2219

23-
<string name="title_non_project_file">Non-Project Files Protection</string>
24-
<string name="message_non_project_file">"This file does not belong to the project: (%s)"</string>
25-
26-
2720
<string name="title_premium_version">Premium version</string>
2821
<string name="button_purchase">Purchase</string>
2922
<string name="message_premium">This app is free and no ads, it open source so you can build easily.

app/src/main/java/com/duy/ccppcompiler/diagnostic/Diagnostic.java renamed to editor-view/src/main/java/com/duy/ide/Diagnostic.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.duy.ccppcompiler.diagnostic;
17+
package com.duy.ide;
1818

1919
import android.content.Context;
2020
import android.os.Parcelable;
2121
import android.support.annotation.Nullable;
2222

23-
import com.duy.ccppcompiler.diagnostic.suggestion.ISuggestion;
23+
import com.duy.ide.suggestion.ISuggestion;
2424

2525
import java.io.File;
2626

0 commit comments

Comments
 (0)