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

Create a new activity for the list of models

parent 589793d0
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 282 additions and 244 deletions
contrib/mobile/Android/AndroidManifest.xml
+ 13
− 6
View file @ 83c7a79d
...@@ -7,23 +7,33 @@ ...@@ -7,23 +7,33 @@
<uses-feature android:glEsVersion="0x00010000" android:required="true"></uses-feature> <uses-feature android:glEsVersion="0x00010000" android:required="true"></uses-feature>
<uses-sdk <uses-sdk
android:targetSdkVersion="17"
android:minSdkVersion="14" /> android:minSdkVersion="14" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/> <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
<uses-permission android:name="android.permission.VIBRATE"/>
<application <application
android:icon="@drawable/ic_launcher" android:icon="@drawable/ic_launcher"
android:label="@string/app_name" android:label="@string/app_name"
android:theme="@style/AppTheme" android:theme="@style/AppTheme"
android:logo="@drawable/ic_launcher" android:logo="@drawable/ic_launcher"
android:allowBackup="true" android:allowBackup="true">
>
<activity <activity
android:name=".SplashScreen" android:name=".SplashScreen"
android:label="@string/title_activity_main" > android:label="@string/title_activity_main">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" /> <category android:name="android.intent.category.LAUNCHER" />
</intent-filter> </intent-filter>
</activity>
<activity
android:name=".ModelList"
android:label="@string/title_activity_main">
</activity>
<activity
android:name=".MainActivity"
android:label="@string/title_activity_main"
android:screenOrientation="landscape">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.VIEW" /> <action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
...@@ -32,9 +42,6 @@ ...@@ -32,9 +42,6 @@
<data android:scheme="file" android:host="*" android:pathPattern=".*\\.pro" android:mimeType="*/*" /> <data android:scheme="file" android:host="*" android:pathPattern=".*\\.pro" android:mimeType="*/*" />
</intent-filter> </intent-filter>
</activity> </activity>
<activity
android:name=".MainActivity"
android:label="@string/title_activity_main" />
</application> </application>
</manifest> </manifest>
\ No newline at end of file
contrib/mobile/Android/src/org/geuz/onelab/MainActivity.java
+ 27
− 230
View file @ 83c7a79d
package org.geuz.onelab; package org.geuz.onelab;
import java.io.File;
import java.io.FilenameFilter;
import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
import android.opengl.GLSurfaceView; import android.opengl.GLSurfaceView;
import android.os.AsyncTask; import android.os.AsyncTask;
import android.os.Bundle; import android.os.Bundle;
import android.os.Environment;
import android.os.Handler; import android.os.Handler;
import android.os.Vibrator; import android.os.Vibrator;
import android.app.Activity; import android.app.Activity;
import android.app.AlertDialog; import android.app.AlertDialog;
import android.app.Dialog;
import android.app.DialogFragment;
import android.app.ProgressDialog; import android.app.ProgressDialog;
import android.content.Context; import android.content.Context;
import android.content.DialogInterface; import android.content.DialogInterface;
import android.content.Intent; import android.content.Intent;
import android.content.res.Configuration; import android.content.res.Configuration;
import android.content.res.XmlResourceParser;
import android.graphics.Color; import android.graphics.Color;
import android.graphics.Point; import android.graphics.Point;
import android.support.v4.view.PagerAdapter; import android.support.v4.view.PagerAdapter;
...@@ -45,14 +35,12 @@ import android.view.ViewGroup; ...@@ -45,14 +35,12 @@ import android.view.ViewGroup;
import android.view.WindowManager; import android.view.WindowManager;
import android.view.inputmethod.InputMethodManager; import android.view.inputmethod.InputMethodManager;
import android.widget.AdapterView; import android.widget.AdapterView;
import android.widget.AdapterView.OnItemClickListener;
import android.widget.ArrayAdapter; import android.widget.ArrayAdapter;
import android.widget.Button; import android.widget.Button;
import android.widget.CheckBox; import android.widget.CheckBox;
import android.widget.CompoundButton; import android.widget.CompoundButton;
import android.widget.EditText; import android.widget.EditText;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import android.widget.ListView;
import android.widget.ScrollView; import android.widget.ScrollView;
import android.widget.Spinner; import android.widget.Spinner;
import android.widget.TableLayout; import android.widget.TableLayout;
...@@ -65,8 +53,6 @@ public class MainActivity extends Activity { ...@@ -65,8 +53,6 @@ public class MainActivity extends Activity {
private GLESRender renderer; private GLESRender renderer;
private ProgressDialog loading; private ProgressDialog loading;
private AlertDialog.Builder dialogBuilder; private AlertDialog.Builder dialogBuilder;
private Models modelList;
private int model;
private Gmsh gmsh; private Gmsh gmsh;
private Button run, reset; private Button run, reset;
private UndragableViewPager pager; private UndragableViewPager pager;
...@@ -96,18 +82,23 @@ public class MainActivity extends Activity { ...@@ -96,18 +82,23 @@ public class MainActivity extends Activity {
Intent intent = getIntent(); Intent intent = getIntent();
gmsh = new Gmsh("", mainHandler); gmsh = new Gmsh("", mainHandler);
modelList = new Models(); Bundle extras = getIntent().getExtras();
getModels();
if(intent != null && intent.getAction() != null && intent.getAction().equals(Intent.ACTION_VIEW)) { if(intent != null && intent.getAction() != null && intent.getAction().equals(Intent.ACTION_VIEW)) {
String tmp = intent.getData().getPath(); String tmp = intent.getData().getPath();
pager.setCurrentItem(1); pager.setCurrentItem(1);
gmsh.load(tmp); gmsh.load(tmp);
}
else if(extras != null) {
pager.setCurrentItem(0);
//extras.getInt("model");
//extras.getString("name");
String tmp = extras.getString("file");
gmsh.load(tmp);
getAvailableParam();
if(params.size()>0)params.get(params.size() - 1)._changed = true; // Hack for the first run
} }
else if(modelList.size() > 0){ else
model = 0; this.finish();
String tmp = getFilesDir()+ "/" + modelList.getFile(model);
gmsh.load(tmp);
}
setContentView(layout); setContentView(layout);
} }
...@@ -142,11 +133,11 @@ public class MainActivity extends Activity { ...@@ -142,11 +133,11 @@ public class MainActivity extends Activity {
@Override @Override
public boolean onMenuItemSelected(int featureId, MenuItem item) { public boolean onMenuItemSelected(int featureId, MenuItem item) {
if(item.getTitle().equals(getString(R.string.menu_settings))) if(item.getTitle().equals(getString(R.string.menu_settings)))
pager.setCurrentItem(1, true);
else if(item.getTitle().equals(getString(R.string.menu_list)))
pager.setCurrentItem(0, true); pager.setCurrentItem(0, true);
else if(item.getTitle().equals(getString(R.string.menu_list)))
this.finish();
else if (item.getTitle().equals(getString(R.string.menu_model))) else if (item.getTitle().equals(getString(R.string.menu_model)))
pager.setCurrentItem(2, true); pager.setCurrentItem(1, true);
else if(item.getTitle().equals(getString(R.string.menu_postpro))){ else if(item.getTitle().equals(getString(R.string.menu_postpro))){
dialogBuilder.setTitle("Post proccessing") dialogBuilder.setTitle("Post proccessing")
.setView(postproView()) .setView(postproView())
...@@ -183,6 +174,12 @@ public class MainActivity extends Activity { ...@@ -183,6 +174,12 @@ public class MainActivity extends Activity {
public UndragableViewPager(Context context) { public UndragableViewPager(Context context) {
super(context); super(context);
} }
@Override
public boolean onTouchEvent(MotionEvent arg0) {
return true;
}
@Override @Override
public boolean onInterceptTouchEvent(MotionEvent arg0) { public boolean onInterceptTouchEvent(MotionEvent arg0) {
return false; return false;
...@@ -195,26 +192,20 @@ public class MainActivity extends Activity { ...@@ -195,26 +192,20 @@ public class MainActivity extends Activity {
@Override @Override
public Object instantiateItem(ViewGroup container, int position) { public Object instantiateItem(ViewGroup container, int position) {
switch (position) { switch (position) {
case 0: // Select a model case 0: // Parameters
View listView = listView(container.getContext());
container.addView(listView);
listView.setPadding(15, 10, 10, 5);
listView.setBackgroundColor(Color.argb(255, 67, 67, 67));
return listView;
case 1: // Parameters
(MainActivity.this).getAvailableParam(); (MainActivity.this).getAvailableParam();
View paramView = (MainActivity.this).paramView(container.getContext()); View paramView = (MainActivity.this).paramView(container.getContext());
container.addView(paramView); container.addView(paramView);
paramView.setPadding(15, 10, 10, 5); paramView.setPadding(15, 10, 10, 5);
return paramView; return paramView;
case 2: // OpenGL ES view case 1: // OpenGL ES view
renderer = new GLESRender(gmsh); renderer = new GLESRender(gmsh);
glView = new mGLSurfaceView(container.getContext(), renderer); glView = new mGLSurfaceView(container.getContext(), renderer);
//TODO the glView seems break the ViewPager (black square appear ...) //TODO the glView seems break the ViewPager (black square appear ...)
glView.setEGLContextClientVersion(1); glView.setEGLContextClientVersion(1);
glView.setRenderer(renderer); glView.setRenderer(renderer);
glView.setRenderMode(GLSurfaceView.RENDERMODE_WHEN_DIRTY); glView.setRenderMode(GLSurfaceView.RENDERMODE_WHEN_DIRTY);
glView.requestRender();
container.addView(glView); container.addView(glView);
return glView; return glView;
default: // ??? default: // ???
...@@ -271,7 +262,7 @@ public class MainActivity extends Activity { ...@@ -271,7 +262,7 @@ public class MainActivity extends Activity {
private void getAvailableParam(){ private void getAvailableParam(){
String[] tmp = gmsh.getParams(); String[] tmp = gmsh.getParams();
for(String s : tmp){ // for each parameters in onelab for(String s : tmp){ // for each parameters in ONEALB
boolean found = false; boolean found = false;
for(Parameter p : params){ // for each parameters for(Parameter p : params){ // for each parameters
if(s.split("\n")[2].equals(p.getName())){ // the parameter already exist, just refresh it if(s.split("\n")[2].equals(p.getName())){ // the parameter already exist, just refresh it
...@@ -303,54 +294,6 @@ public class MainActivity extends Activity { ...@@ -303,54 +294,6 @@ public class MainActivity extends Activity {
} }
} }
} }
private void getModels()
{
XmlResourceParser parser = getResources().getXml(R.xml.models);
int eventType;
try {
eventType = parser.getEventType();
while (eventType != XmlPullParser.END_DOCUMENT) {
if(eventType == XmlPullParser.START_DOCUMENT){
eventType = parser.next();
continue;
}
else if(eventType == XmlPullParser.START_TAG && parser.getName().equals("model")) {
String title = "", file = "", summary = "";
while(eventType != XmlPullParser.END_TAG || !parser.getName().equals("model"))
{
eventType = parser.next();
if(eventType == XmlPullParser.START_TAG && parser.getName().equals("title")){
eventType = parser.next();
if(eventType == XmlPullParser.TEXT)
title = parser.getText();
}
else if(eventType == XmlPullParser.START_TAG && parser.getName().equals("summary")){
eventType = parser.next();
if(eventType == XmlPullParser.TEXT)
summary = parser.getText();
}
else if(eventType == XmlPullParser.START_TAG && parser.getName().equals("file")){
eventType = parser.next();
if(eventType == XmlPullParser.TEXT)
file = parser.getText();
}
}
if(title.length() > 0) modelList.addModel(title, summary, file);
}
eventType = parser.next();
}
} catch (XmlPullParserException e) {
// TODO Error in XML file
e.printStackTrace();
} catch (IOException e) {
// TODO Error in XML file
e.printStackTrace();
}
}
private View postproView() { private View postproView() {
ScrollView scroll = new ScrollView(this); ScrollView scroll = new ScrollView(this);
...@@ -477,14 +420,14 @@ public class MainActivity extends Activity { ...@@ -477,14 +420,14 @@ public class MainActivity extends Activity {
else else
new Run().execute(); new Run().execute();
pager.setCurrentItem(2, true); pager.setCurrentItem(1, true);
}}); }});
reset.setOnClickListener(new OnClickListener() {public void onClick(View v) { reset.setOnClickListener(new OnClickListener() {public void onClick(View v) {
if(gmsh.onelabCB("reset") == 1){ if(gmsh.onelabCB("reset") == 1){
getAvailableParam(); getAvailableParam();
glView.requestRender(); glView.requestRender();
} }
pager.setCurrentItem(1, true); pager.setCurrentItem(0, true);
}}); }});
LinearLayout onelabBtns = new LinearLayout(this); LinearLayout onelabBtns = new LinearLayout(this);
onelabBtns.setOrientation(LinearLayout.HORIZONTAL); onelabBtns.setOrientation(LinearLayout.HORIZONTAL);
...@@ -522,152 +465,6 @@ public class MainActivity extends Activity { ...@@ -522,152 +465,6 @@ public class MainActivity extends Activity {
return paramListView; return paramListView;
} }
private View listView(Context ctx) {
LinearLayout layout = new LinearLayout(ctx);
layout.setOrientation(LinearLayout.VERTICAL);
ListView list = new ListView(ctx);
list.setAdapter( new ModeleArrayAdapter(ctx, modelList));
list.setOnItemClickListener(new OnItemClickListener() {
public void onItemClick(AdapterView<?> parent, View view, int position,
long id) {
model = (position < modelList.size())? position : 0;
String tmp = getFilesDir() + "/" + modelList.getFile(model);
gmsh.load(tmp);
params.clear();
paramListView.clear();
getAvailableParam();
if(params.size()>0)params.get(params.size() - 1)._changed = true; // Hack for the first run
glView.requestRender();
pager.setCurrentItem(1);
}
});
layout.addView(list);
Button loadSD = new Button(ctx);
loadSD.setText(R.string.button_open_external_file);
loadSD.setLayoutParams(new LayoutParams(LayoutParams.MATCH_PARENT,LayoutParams.WRAP_CONTENT));
loadSD.setOnClickListener(new OnClickListener() {
public void onClick(View v) {
@SuppressWarnings("unused")
SDFileChooser f = new SDFileChooser();
}
});
layout.addView(loadSD);
return layout;
}
private class SDFileChooser{
File curentPath;
FileDialog dialog;
public SDFileChooser() {
String state = Environment.getExternalStorageState();
if (Environment.MEDIA_MOUNTED.equals(state) || Environment.MEDIA_MOUNTED_READ_ONLY.equals(state)) {
curentPath = Environment.getExternalStorageDirectory();
showList(getFile(curentPath));
}
else
showMessage(R.string.error_nosdcard);
}
public void setPath(String newPath) {
curentPath = new File(newPath);
showList(getFile(curentPath));
}
public String getPath() {
return curentPath.toString();
}
private void showList(String[] list) {
if(!curentPath.toString().equals(Environment.getExternalStorageDirectory().toString())){
String[] newList = new String[list.length + 1];
for(int i=0;i<list.length;i++)
newList[i+1] = list[i];
newList[0] = "..";
list = newList;
}
if(list.length < 1){
showMessage(R.string.error_nomshfile);
return;
}
if(dialog != null) dialog.dismiss();
dialog = new FileDialog(this, list);
dialog.show(getFragmentManager(), "files");
}
private void showMessage(int msg) {
dialog = new FileDialog(this, msg);
dialog.show(getFragmentManager(), "msg");
}
private String[] getFile(File path) {
return path.list(new FilenameFilter() {
public boolean accept(File dir, String filename) {
String ext = filename.substring(filename.lastIndexOf(".") + 1, filename.length());
File curent = new File(dir.toString()+"/"+filename);
if(curent.isHidden())
return false;
else if(curent.isDirectory())
return true;
else if(ext.equals("MSH") || ext.equals("msh"))
return true;
else
return false;
}
});
}
private class FileDialog extends DialogFragment {
String[] list;
int msg = -1;
SDFileChooser parent;
public FileDialog(SDFileChooser p, String[] l) {
list = l;
parent = p;
}
public FileDialog(SDFileChooser p, int m) {
msg = m;
parent = p;
}
@Override
public Dialog onCreateDialog(Bundle savedInstanceState) {
AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
if(msg > 0) {
builder.setMessage(R.string.error_nomshfile)
.setPositiveButton(R.string.button_ok, null);
}
else {
builder.setTitle(R.string.dialog_title_choosefile);
builder.setItems(list, new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int which) {
if(list[which].equals(".."))
parent.setPath(curentPath.getParentFile().toString());
else if( new File(parent.getPath() + "/" + list[which]).isDirectory())
parent.setPath(parent.getPath() + "/" + list[which]);
else {
String ext = list[which].substring(list[which].lastIndexOf(".") + 1, list[which].length());
if(ext.equals("MSH") || ext.equals("msh")) {
gmsh.load(curentPath+"/"+getFile(curentPath)[which]);
glView.requestRender();
}
}
}
});
}
return builder.create();
};
}
}
private class Run extends AsyncTask<Void, Void, Integer[]> { private class Run extends AsyncTask<Void, Void, Integer[]> {
@Override @Override
......
contrib/mobile/Android/src/org/geuz/onelab/ModelList.java 0 → 100644
+ 233
− 0
View file @ 83c7a79d
package org.geuz.onelab;
import java.io.File;
import java.io.FilenameFilter;
import java.io.IOException;
import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
import android.app.Activity;
import android.app.AlertDialog;
import android.app.Dialog;
import android.app.DialogFragment;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.res.XmlResourceParser;
import android.graphics.Color;
import android.os.Bundle;
import android.os.Environment;
import android.view.View;
import android.view.ViewGroup.LayoutParams;
import android.widget.AdapterView;
import android.widget.Button;
import android.widget.LinearLayout;
import android.widget.ListView;
import android.widget.AdapterView.OnItemClickListener;
public class ModelList extends Activity {
private Models modelList;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
this.modelList = new Models();
this.getModels();
LinearLayout layout = new LinearLayout(this);
layout.setOrientation(LinearLayout.VERTICAL);
ListView list = new ListView(this);
Button loadSD = new Button(this);
loadSD.setText(R.string.button_open_external_file);
loadSD.setLayoutParams(new LayoutParams(LayoutParams.MATCH_PARENT,LayoutParams.WRAP_CONTENT));
loadSD.setOnClickListener(new View.OnClickListener() {
public void onClick(View v) {
@SuppressWarnings("unused")
SDFileChooser f = new SDFileChooser();
}
});
list.addFooterView(loadSD);
list.setAdapter( new ModeleArrayAdapter(this, modelList));
list.setOnItemClickListener(new OnItemClickListener() {
public void onItemClick(AdapterView<?> parent, View view, int position,
long id) {
int model = (position < modelList.size())? position : 0;
String path = getFilesDir() + "/" + modelList.getFile(model);
Intent intent = new Intent(ModelList.this, MainActivity.class);
intent.putExtra("model", model);
intent.putExtra("file", path);
intent.putExtra("name", modelList.getName(model));
startActivity(intent);
}
});
layout.addView(list);
this.setContentView(layout);
layout.setPadding(15, 10, 10, 5);
layout.setBackgroundColor(Color.argb(255, 67, 67, 67));
}
private void getModels()
{
XmlResourceParser parser = getResources().getXml(R.xml.models);
int eventType;
try {
eventType = parser.getEventType();
while (eventType != XmlPullParser.END_DOCUMENT) {
if(eventType == XmlPullParser.START_DOCUMENT){
eventType = parser.next();
continue;
}
else if(eventType == XmlPullParser.START_TAG && parser.getName().equals("model")) {
String title = "", file = "", summary = "";
while(eventType != XmlPullParser.END_TAG || !parser.getName().equals("model"))
{
eventType = parser.next();
if(eventType == XmlPullParser.START_TAG && parser.getName().equals("title")){
eventType = parser.next();
if(eventType == XmlPullParser.TEXT)
title = parser.getText();
}
else if(eventType == XmlPullParser.START_TAG && parser.getName().equals("summary")){
eventType = parser.next();
if(eventType == XmlPullParser.TEXT)
summary = parser.getText();
}
else if(eventType == XmlPullParser.START_TAG && parser.getName().equals("file")){
eventType = parser.next();
if(eventType == XmlPullParser.TEXT)
file = parser.getText();
}
}
if(title.length() > 0) modelList.addModel(title, summary, file);
}
eventType = parser.next();
}
} catch (XmlPullParserException e) {
// TODO Error in XML file
e.printStackTrace();
} catch (IOException e) {
// TODO Error in XML file
e.printStackTrace();
}
}
private class SDFileChooser{
File curentPath;
FileDialog dialog;
public SDFileChooser() {
String state = Environment.getExternalStorageState();
if (Environment.MEDIA_MOUNTED.equals(state) || Environment.MEDIA_MOUNTED_READ_ONLY.equals(state)) {
curentPath = Environment.getExternalStorageDirectory();
showList(getFile(curentPath));
}
else
showMessage(R.string.error_nosdcard);
}
public void setPath(String newPath) {
curentPath = new File(newPath);
showList(getFile(curentPath));
}
public String getPath() {
return curentPath.toString();
}
private void showList(String[] list) {
if(!curentPath.toString().equals(Environment.getExternalStorageDirectory().toString())){
String[] newList = new String[list.length + 1];
for(int i=0;i<list.length;i++)
newList[i+1] = list[i];
newList[0] = "..";
list = newList;
}
if(list.length < 1){
showMessage(R.string.error_nomshfile);
return;
}
if(dialog != null) dialog.dismiss();
dialog = new FileDialog(this, list);
dialog.show(getFragmentManager(), "files");
}
private void showMessage(int msg) {
dialog = new FileDialog(this, msg);
dialog.show(getFragmentManager(), "msg");
}
private String[] getFile(File path) {
return path.list(new FilenameFilter() {
public boolean accept(File dir, String filename) {
String ext = filename.substring(filename.lastIndexOf(".") + 1, filename.length());
File curent = new File(dir.toString()+"/"+filename);
if(curent.isHidden())
return false;
else if(curent.isDirectory())
return true;
else if(ext.equals("MSH") || ext.equals("msh") || ext.equals("geo") || ext.equals("GEO") || ext.equals("pro") || ext.equals("PRO"))
return true;
else
return false;
}
});
}
private class FileDialog extends DialogFragment {
String[] list;
int msg = -1;
SDFileChooser parent;
public FileDialog(SDFileChooser p, String[] l) {
list = l;
parent = p;
}
public FileDialog(SDFileChooser p, int m) {
msg = m;
parent = p;
}
@Override
public Dialog onCreateDialog(Bundle savedInstanceState) {
AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
if(msg > 0) {
builder.setMessage(R.string.error_nomshfile)
.setPositiveButton(R.string.button_ok, null);
}
else {
builder.setTitle(R.string.dialog_title_choosefile);
builder.setItems(list, new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int which) {
if(list[which].equals(".."))
parent.setPath(curentPath.getParentFile().toString());
else if( new File(parent.getPath() + "/" + list[which]).isDirectory())
parent.setPath(parent.getPath() + "/" + list[which]);
else {
String ext = list[which].substring(list[which].lastIndexOf(".") + 1, list[which].length());
if(ext.equals("MSH") || ext.equals("msh") || ext.equals("geo") || ext.equals("GEO") || ext.equals("pro") || ext.equals("PRO")) {
Intent intent = new Intent(ModelList.this, MainActivity.class);
intent.putExtra("file", curentPath+"/"+getFile(curentPath)[which]);
startActivity(intent);
}
}
}
});
}
return builder.create();
};
}
}
}
contrib/mobile/Android/src/org/geuz/onelab/ModeleArrayAdapter.java
+ 5
− 6
View file @ 83c7a79d
package org.geuz.onelab; package org.geuz.onelab;
import android.content.Context; import android.content.Context;
import android.graphics.Color;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
...@@ -41,13 +40,13 @@ public class ModeleArrayAdapter extends ArrayAdapter<String> { ...@@ -41,13 +40,13 @@ public class ModeleArrayAdapter extends ArrayAdapter<String> {
.getSystemService(Context.LAYOUT_INFLATER_SERVICE); .getSystemService(Context.LAYOUT_INFLATER_SERVICE);
View rowView = inflater.inflate(R.layout.model, parent, false); View rowView = inflater.inflate(R.layout.model, parent, false);
TextView Titre = (TextView) rowView.findViewById(R.id.titre); TextView Title = (TextView) rowView.findViewById(R.id.title);
TextView Description = (TextView) rowView.findViewById(R.id.description); TextView Description = (TextView) rowView.findViewById(R.id.description);
ImageView Icone = (ImageView) rowView.findViewById(R.id.icone); ImageView Icon = (ImageView) rowView.findViewById(R.id.icon);
if(this.titres != null) Titre.setText(this.titres[position]); if(this.titres != null) Title.setText(this.titres[position]);
if(this.descriptions != null) Description.setText(this.descriptions[position]); if(this.descriptions != null) Description.setText(this.descriptions[position]);
if(Icone != null) Icone.setImageResource(R.drawable.ic_launcher); if(Icon != null) Icon.setImageResource(R.drawable.ic_launcher);
Icone.setPadding(10, 10, 10, 10); Icon.setPadding(10, 10, 10, 10);
return rowView; return rowView;
} }
......
contrib/mobile/Android/src/org/geuz/onelab/ParameterString.java
+ 1
− 1
View file @ 83c7a79d
...@@ -28,7 +28,7 @@ public class ParameterString extends Parameter{ ...@@ -28,7 +28,7 @@ public class ParameterString extends Parameter{
_choices = new ArrayList<String>(); _choices = new ArrayList<String>();
_choices.add("-"); // Default choice _choices.add("-"); // Default choice
} }
private void createSpinner() private void createSpinner()
{ {
if(_spinner != null) return; if(_spinner != null) return;
......
contrib/mobile/Android/src/org/geuz/onelab/SplashScreen.java
+ 3
− 1
View file @ 83c7a79d
...@@ -40,12 +40,14 @@ public class SplashScreen extends Activity{ ...@@ -40,12 +40,14 @@ public class SplashScreen extends Activity{
protected void onCreate(android.os.Bundle savedInstanceState) { protected void onCreate(android.os.Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setContentView(R.layout.splash); setContentView(R.layout.splash);
newIntent = new Intent(SplashScreen.this, MainActivity.class);
Intent oldIntent = this.getIntent(); Intent oldIntent = this.getIntent();
if(oldIntent != null && oldIntent.getAction() != null && oldIntent.getAction().equals(Intent.ACTION_VIEW)){ if(oldIntent != null && oldIntent.getAction() != null && oldIntent.getAction().equals(Intent.ACTION_VIEW)){
newIntent = new Intent(SplashScreen.this, MainActivity.class);
newIntent.setAction(oldIntent.getAction()); newIntent.setAction(oldIntent.getAction());
newIntent.setData(oldIntent.getData()); newIntent.setData(oldIntent.getData());
} }
else
newIntent = new Intent(SplashScreen.this, ModelList.class);
loadNative(); loadNative();
final Message msg = new Message(); final Message msg = new Message();
msg.what = STOPSPLASH; msg.what = STOPSPLASH;
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment