Skip to content
Snippets Groups Projects
Commit 51a6aa6e authored by Maxime Graulich's avatar Maxime Graulich
Browse files

Android: add run button in menu on OptionsActivity

parent f1280ac7
No related branches found
No related tags found
No related merge requests found
......@@ -99,7 +99,8 @@ public class MainActivity extends Activity{
if (item.getTitle().equals(getString(R.string.menu_parameters))) {
Intent intent = new Intent(this, OptionsActivity.class);
intent.putExtra("Gmsh", (Parcelable)_gmsh);
startActivity(intent);
intent.putExtra("Compute", _compute);
startActivityForResult(intent, 1);
_modelFragment.requestRender();
}
else if(item.getTitle().equals(getString(R.string.menu_run))){
......@@ -135,6 +136,17 @@ public class MainActivity extends Activity{
return super.onMenuItemSelected(featureId, item);
}
@Override
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
super.onActivityResult(requestCode, resultCode, data);
switch (requestCode) {
case 1:
if(resultCode == RESULT_OK)
if(!_compute && data.getBooleanExtra("Compute", false)) new Run().execute();
break;
}
}
private class Run extends AsyncTask<Void, Void, Integer[]> {
@Override
......
......@@ -78,7 +78,7 @@ public class ModelList extends Activity {
if(m.getUrl() != null) {
actions = new CharSequence[2];
actions[0] = "Open this model";
actions[1] = "More informations";
actions[1] = "More information";
}
else {
actions = new CharSequence[1];
......
package org.geuz.onelab;
import android.app.Activity;
import android.content.Intent;
import android.os.Bundle;
import android.view.Menu;
import android.view.MenuItem;
import android.view.WindowManager;
public class OptionsActivity extends Activity {
boolean _compute;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN);
setContentView(R.layout.activity_fragment);
Bundle extra = getIntent().getExtras();
Gmsh gmsh = extra.getParcelable("Gmsh");
_compute = extra.getBoolean("Compute", false);
getActionBar().setDisplayHomeAsUpEnabled(true);
getActionBar().setTitle(R.string.title_activity_options);
OptionsFragment optionsFragment = OptionsFragment.newInstance(gmsh);
getFragmentManager().beginTransaction().add(R.id.model_fragment, optionsFragment).commit();
}
@Override
public boolean onCreateOptionsMenu(Menu menu) {
if(_compute) return super.onCreateOptionsMenu(menu);
MenuItem runStopMenuItem = menu.add(R.string.menu_run);
runStopMenuItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
return super.onCreateOptionsMenu(menu);
}
@Override
public boolean onMenuItemSelected(int featureId, MenuItem item) {
if(item.getItemId() == android.R.id.home)
if(item.getTitle().equals(getString(R.string.menu_run))) {
Intent returnIntent = new Intent();
returnIntent.putExtra("Compute", true);
this.setResult(RESULT_OK, returnIntent);
this.finish();
}
else if(item.getItemId() == android.R.id.home) {
Intent returnIntent = new Intent();
this.setResult(RESULT_CANCELED, returnIntent);
this.finish();
}
return super.onMenuItemSelected(featureId, item);
}
}
......@@ -167,7 +167,6 @@ public class ParameterNumber extends Parameter{
_spinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
public void onNothingSelected(AdapterView<?> arg0) {}
public void onItemSelected(AdapterView<?> parent, View view, int pos, long id) {
setValue(_values.get(pos));
_gmsh.setParam(getType(), getName(), String.valueOf(_values.get(pos)));
}
});
......
......@@ -3,11 +3,13 @@ package org.geuz.onelab;
import android.app.Activity;
import android.os.Bundle;
import android.view.MenuItem;
import android.view.WindowManager;
public class PostProcessingActivity extends Activity{
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN);
setContentView(R.layout.activity_fragment);
Bundle extra = getIntent().getExtras();
int id = extra.getInt("PView", 0);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment