From 154a7248e7d0c1f0667113f472a28ef389ab0da1 Mon Sep 17 00:00:00 2001
From: Maxime Graulich <maxime.graulich@gmail.com>
Date: Wed, 11 Sep 2013 12:32:12 +0000
Subject: [PATCH] Android: fix warning
---
contrib/mobile/Android/res/values/strings.xml | 7 +++----
.../Android/src/org/geuz/onelab/MainActivity.java | 13 +++----------
.../Android/src/org/geuz/onelab/ModelList.java | 10 ++--------
3 files changed, 8 insertions(+), 22 deletions(-)
diff --git a/contrib/mobile/Android/res/values/strings.xml b/contrib/mobile/Android/res/values/strings.xml
index 982ffae332..76673652a1 100644
--- a/contrib/mobile/Android/res/values/strings.xml
+++ b/contrib/mobile/Android/res/values/strings.xml
@@ -1,7 +1,7 @@
<resources>
<string name="app_name">Onelab</string>
- <string name="button_open_external_file">Open file from external storage</string>
+ <string name="button_open_file">Open file</string>
<string name="button_ok">OK</string>
<string name="button_recalculate_param">Recalulate with new parameters</string>
<string name="dialog_title_choosefile">Choose a file</string>
@@ -9,10 +9,9 @@
<string name="title_activity_main">Onelab</string>
<string name="title_activity_options">Parameters</string>
<string name="error_nomshfile">No compatible files or directories in this folder</string>
- <string name="menu_model">Show the model</string>
+ <string name="title_share">Share screenshot with …</string>
+ <string name="menu_share">Share screenshot</string>
<string name="menu_parameters">Parameters</string>
- <string name="menu_parameters_model">Model</string>
- <string name="menu_parameters_display">Display</string>
<string name="menu_run">Run</string>
<string name="menu_stop">Stop</string>
<string name="postpro_intervalstype">Intervals type</string>
diff --git a/contrib/mobile/Android/src/org/geuz/onelab/MainActivity.java b/contrib/mobile/Android/src/org/geuz/onelab/MainActivity.java
index 3b9f8a5299..994abf8393 100644
--- a/contrib/mobile/Android/src/org/geuz/onelab/MainActivity.java
+++ b/contrib/mobile/Android/src/org/geuz/onelab/MainActivity.java
@@ -96,7 +96,7 @@ public class MainActivity extends Activity{
}
_runStopMenuItem = menu.add((_compute)?R.string.menu_stop:R.string.menu_run);
_runStopMenuItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
- MenuItem shareMenuItem = menu.add("Share ...");
+ MenuItem shareMenuItem = menu.add(R.string.menu_share);
shareMenuItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
return true;
}
@@ -110,19 +110,12 @@ public class MainActivity extends Activity{
_modelFragment.requestRender();
}
else if(item.getTitle().equals(getString(R.string.menu_run))){
- if(_switchFragmentMenuItem != null && _switchFragmentMenuItem.getTitle().equals(getString(R.string.menu_model))) {
- _switchFragmentMenuItem.setTitle(R.string.menu_parameters);
- FragmentTransaction ft = getFragmentManager().beginTransaction();
- ft.replace(R.id.model_fragment, _modelFragment);
- ft.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_CLOSE);
- ft.commit();
- }
new Run().execute();
}
else if(item.getTitle().equals(getString(R.string.menu_stop))){
_gmsh.onelabCB("stop");
}
- else if(item.getTitle().equals("Share ...")) {
+ else if(item.getTitle().equals(getString(R.string.menu_share))) {
if(this._compute) {
AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(this);
_errorDialog = dialogBuilder.setTitle("Can't show the models list")
@@ -144,7 +137,7 @@ public class MainActivity extends Activity{
shareIntent.setAction(Intent.ACTION_SEND);
shareIntent.putExtra(Intent.EXTRA_STREAM, Uri.fromFile(file));
shareIntent.setType("image/jpeg");
- startActivity(Intent.createChooser(shareIntent, "Share screenshot with"));
+ startActivity(Intent.createChooser(shareIntent, getString(R.string.title_share)));
}
}
else if(item.getItemId() == android.R.id.home)
diff --git a/contrib/mobile/Android/src/org/geuz/onelab/ModelList.java b/contrib/mobile/Android/src/org/geuz/onelab/ModelList.java
index 906612122a..294f249707 100644
--- a/contrib/mobile/Android/src/org/geuz/onelab/ModelList.java
+++ b/contrib/mobile/Android/src/org/geuz/onelab/ModelList.java
@@ -2,7 +2,6 @@ package org.geuz.onelab;
import java.io.File;
import java.io.FileInputStream;
-import java.io.FilenameFilter;
import java.io.IOException;
import java.io.InputStream;
@@ -11,23 +10,18 @@ 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.database.Cursor;
import android.graphics.Color;
import android.net.Uri;
import android.os.Bundle;
-import android.os.Environment;
import android.provider.MediaStore;
import android.util.Xml;
import android.view.Menu;
import android.view.MenuItem;
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;
@@ -108,14 +102,14 @@ public class ModelList extends Activity {
@Override
public boolean onCreateOptionsMenu(Menu menu) {
- MenuItem loadFile = menu.add(R.string.button_open_external_file);
+ MenuItem loadFile = menu.add(R.string.button_open_file);
loadFile.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
return super.onCreateOptionsMenu(menu);
}
@Override
public boolean onMenuItemSelected(int featureId, MenuItem item) {
- if(item.getTitle().equals(getString(R.string.button_open_external_file))) {
+ if(item.getTitle().equals(getString(R.string.button_open_file))) {
Intent fileBrowserIntent = new Intent();
fileBrowserIntent.setAction(Intent.ACTION_GET_CONTENT);
fileBrowserIntent.setType("file/*");
--
GitLab