Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Improve Settings Page and more #137

Merged
merged 3 commits into from
Jul 13, 2022
Merged

Improve Settings Page and more #137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7c45a22
Improve Settings Page and more
aikrq Jul 13, 2022
fa8b697
Merge branch 'PranavPurwar:main' into main
aikrq Jul 13, 2022
45697be
Hide dialog after button click
aikrq Jul 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 22 additions & 20 deletions app/src/main/java/com/pranav/java/ide/MainActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,25 +224,27 @@ public boolean onCreateOptionsMenu(Menu menu) {

@Override
public boolean onOptionsItemSelected(MenuItem item) {
int id = item.getItemId();
if (id == R.id.format_menu_button) {
CoroutineUtil.execute(
() -> {
if (prefs.getString("formatter", "Google Java Formatter")
.equals("Google Java Formatter")) {
var formatter = new GoogleJavaFormatter(editor.getText().toString());
temp = formatter.format();
} else {
var formatter = new EclipseJavaFormatter(editor.getText().toString());
temp = formatter.format();
}
});
editor.setText(temp);
} else if (id == R.id.settings_menu_button) {
var intent = new Intent(MainActivity.this, SettingActivity.class);
startActivity(intent);
} else if (id == R.id.run_menu_button) {
compile(true, false);
switch(item.getItemId()) {
case R.id.format_menu_button:
CoroutineUtil.execute(
() -> {
if (prefs.getString("formatter", "Google Java Formatter")
.equals("Google Java Formatter")) {
var formatter = new GoogleJavaFormatter(editor.getText().toString());
temp = formatter.format();
} else {
var formatter = new EclipseJavaFormatter(editor.getText().toString());
temp = formatter.format();
}
});
editor.setText(temp);
break;
case R.id.settings_menu_button:
startActivity(new Intent(MainActivity.this, SettingActivity.class));
break;
case R.id.run_menu_button:
compile(true, false);
break;
}
return super.onOptionsItemSelected(item);
}
Expand Down Expand Up @@ -576,7 +578,7 @@ public String[] getClassesFromDex() {
private String getString(final Throwable e) {
return Log.getStackTraceString(e);
}

public JavaProject getProject() {
return javaProject;
}
Expand Down
58 changes: 57 additions & 1 deletion app/src/main/java/com/pranav/java/ide/ProjectActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,18 @@
import android.content.Intent;
import android.os.Bundle;
import android.text.TextUtils;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
import android.widget.Button;
import android.widget.EditText;
import android.widget.LinearLayout;
import android.widget.TextView;

import androidx.appcompat.app.AppCompatActivity;
import androidx.appcompat.app.AlertDialog;
import androidx.annotation.WorkerThread;
import androidx.core.view.WindowCompat;
import androidx.recyclerview.widget.RecyclerView;
import androidx.recyclerview.widget.LinearLayoutManager;

Expand Down Expand Up @@ -43,6 +47,7 @@ public interface OnProjectCreatedListener {
private LinearLayout emptyContainer;

private AlertDialog createNewProjectDialog;
private AlertDialog deleteProjectDialog;

private OnProjectCreatedListener mListener;

Expand All @@ -54,8 +59,10 @@ public void setOnProjectCreatedListener(OnProjectCreatedListener listener) {
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_project);
WindowCompat.setDecorFitsSystemWindows(getWindow(), false);

buildCreateNewProjectDialog();
buildDeleteProjectDialog();

var appBarLayout = (AppBarLayout) findViewById(R.id.appbar);
var toolbar = (MaterialToolbar) findViewById(R.id.toolbar);
Expand All @@ -71,11 +78,28 @@ protected void onCreate(Bundle savedInstanceState) {
projectRecycler.setAdapter(projectAdapter);
projectRecycler.setLayoutManager(new LinearLayoutManager(this));
projectAdapter.setOnProjectSelectedListener(this::openProject);
projectAdapter.setOnProjectLongClickedListener(this::deleteProject);
setOnProjectCreatedListener(this::openProject);

createProjectFab.setOnClickListener(v -> showCreateNewProjectDialog());
}

@Override
public boolean onCreateOptionsMenu(Menu menu) {
getMenuInflater().inflate(R.menu.projects_activity_menu, menu);
return true;
}

@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch(item.getItemId()) {
case R.id.settings:
startActivity(new Intent(ProjectActivity.this, SettingActivity.class));
break;
}
return super.onOptionsItemSelected(item);
}

@Override
public void onResume() {
super.onResume();
Expand All @@ -87,6 +111,9 @@ public void onDestroy() {
if (createNewProjectDialog.isShowing()) {
createNewProjectDialog.dismiss();
}
if (deleteProjectDialog.isShowing()) {
deleteProjectDialog.dismiss();
}
super.onDestroy();
}

Expand All @@ -99,6 +126,15 @@ private void buildCreateNewProjectDialog() {
createNewProjectDialog = builder.create();
}

private void buildDeleteProjectDialog() {
var builder = new MaterialAlertDialogBuilder(this);
builder.setTitle(getString(R.string.delete_project));
builder.setMessage("blablabla"); // DON'T REMOVE THIS LINE
builder.setPositiveButton(getString(R.string.delete), null);
builder.setNegativeButton(android.R.string.cancel, null);
deleteProjectDialog = builder.create();
}

@WorkerThread
private void showCreateNewProjectDialog() {
if (!createNewProjectDialog.isShowing()) {
Expand All @@ -125,13 +161,34 @@ private void showCreateNewProjectDialog() {
}
}

private void showDeleteProjectDialog(JavaProject project) {
if (!deleteProjectDialog.isShowing()) {
deleteProjectDialog.show();
TextView message = deleteProjectDialog.findViewById(android.R.id.message);
Button deleteBtn = deleteProjectDialog.findViewById(android.R.id.button1);
message.setText("Are you sure you want to delete the " + project.getProjectName() + " project?");
deleteBtn.setOnClickListener(v -> {
runOnUiThread(() -> {
if (deleteProjectDialog.isShowing()) deleteProjectDialog.dismiss();
project.delete();
loadProjects();
});
});
}
}

private void openProject(JavaProject project) {
var projectPath = project.getProjectDirPath();
var intent = new Intent(ProjectActivity.this, MainActivity.class);
intent.putExtra("project_path", projectPath);
startActivity(intent);
}

private boolean deleteProject(JavaProject project) {
showDeleteProjectDialog(project);
return true;
}

private void loadProjects() {
CoroutineUtil.inParallel(() -> {
var projectDir = new File(JavaProject.getRootDirPath());
Expand All @@ -142,7 +199,6 @@ private void loadProjects() {
for (var directory : directories) {
var project = new File(directory, "src");
if (project.exists()) {
// a temporary solution to a bug that adds double slashes after project path
var javaProject = new JavaProject(new File(directory.getAbsolutePath()));
projects.add(javaProject);
}
Expand Down
Loading