You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@taverna.apache.org by sa...@apache.org on 2016/10/31 09:30:14 UTC
[6/7] incubator-taverna-mobile git commit: remove open workflow
option from nav_option
remove open workflow option from nav_option
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/commit/22d058d9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/22d058d9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/22d058d9
Branch: refs/heads/master
Commit: 22d058d9fc0348bf10052ecadeae320a8c64521d
Parents: b93d871
Author: Sagar <ku...@gmail.com>
Authored: Tue Oct 18 19:39:34 2016 +0530
Committer: Sagar <ku...@gmail.com>
Committed: Tue Oct 18 19:39:34 2016 +0530
----------------------------------------------------------------------
.../activities/DashboardMainActivity.java | 52 +------------
app/src/main/res/menu/drawer_view.xml | 81 +++++++++-----------
2 files changed, 39 insertions(+), 94 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/22d058d9/app/src/main/java/org/apache/taverna/mobile/activities/DashboardMainActivity.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/activities/DashboardMainActivity.java b/app/src/main/java/org/apache/taverna/mobile/activities/DashboardMainActivity.java
index be3b2a6..bca3e04 100644
--- a/app/src/main/java/org/apache/taverna/mobile/activities/DashboardMainActivity.java
+++ b/app/src/main/java/org/apache/taverna/mobile/activities/DashboardMainActivity.java
@@ -29,7 +29,6 @@ import android.app.Dialog;
import android.content.Context;
import android.content.Intent;
import android.content.SharedPreferences;
-import android.net.Uri;
import android.os.Bundle;
import android.os.Environment;
import android.preference.PreferenceManager;
@@ -46,7 +45,6 @@ import android.support.v7.widget.Toolbar;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
-import android.webkit.MimeTypeMap;
import android.widget.TableLayout;
import android.widget.Toast;
@@ -59,7 +57,6 @@ import org.apache.taverna.mobile.ui.licence.LicenceFragment;
import org.apache.taverna.mobile.ui.myworkflows.MyWorkflowFragment;
import org.apache.taverna.mobile.ui.workflow.WorkflowFragment;
import org.apache.taverna.mobile.utils.ActivityUtils;
-import org.apache.taverna.mobile.utils.WorkflowOpen;
import java.io.File;
@@ -184,24 +181,7 @@ public class DashboardMainActivity extends AppCompatActivity {
mDrawerLayout.closeDrawers();
return true;
- case R.id.nav_openworkflow:
-
- Intent workflowSelectIntent =
- new Intent(Intent.ACTION_GET_CONTENT)
- .setDataAndTypeAndNormalize(
- Uri.parse(String.format("%s%s%s",
- Environment.getExternalStorageDirectory(),
- File.separator,
- APP_DIRECTORY_NAME)),
- "application/vnd.taverna.t2flow+xml");
-
- Intent loadWorkflowIntent = Intent.createChooser
- (workflowSelectIntent,
- "Choose Workflow (t2flow or xml)");
- startActivityForResult(loadWorkflowIntent, SELECT_WORKFLOW);
- menuItem.setChecked(true);
- mDrawerLayout.closeDrawers();
- return true;
+
case R.id.nav_usage:
aboutDialog.setCanceledOnTouchOutside(true);
@@ -265,38 +245,8 @@ public class DashboardMainActivity extends AppCompatActivity {
}
- @Override
- public void onActivityResult(int requestCode, int resultCode, Intent data) {
- if (resultCode == RESULT_OK && requestCode == SELECT_WORKFLOW) {
- String workflowPath = data.getData().getPath();
- // Toast.makeText(getBaseContext(), "Path: "+workflowPath, Toast.LENGTH_LONG)
- // .show();
- String type = getMimeType(data.getData().getPath());
- if (type.equals("text/xml") || type.equals("application/vnd.taverna.t2flow+xml")) {
-
- new WorkflowOpen(this).execute(workflowPath);
- } else {
- Toast.makeText(getBaseContext(), "Invalid worklow. Please try again", Toast
- .LENGTH_LONG).show();
- }
- }
- }
- /**
- * Return the mimetype of the file selected to be run as a workflow
- *
- * @param url the path to the seleted file
- * @return the mimetype of the file selected
- */
- private String getMimeType(String url) {
- String type = null;
- String extension = MimeTypeMap.getFileExtensionFromUrl(url);
- if (extension != null) {
- type = MimeTypeMap.getSingleton().getMimeTypeFromExtension(extension);
- }
- return type;
- }
public void restoreActionBar() {
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/22d058d9/app/src/main/res/menu/drawer_view.xml
----------------------------------------------------------------------
diff --git a/app/src/main/res/menu/drawer_view.xml b/app/src/main/res/menu/drawer_view.xml
index 9cd5a26..bfe9105 100644
--- a/app/src/main/res/menu/drawer_view.xml
+++ b/app/src/main/res/menu/drawer_view.xml
@@ -17,48 +17,43 @@
-->
<menu xmlns:android="http://schemas.android.com/apk/res/android">
- <group android:checkableBehavior="single">
- <item
- android:id="@+id/nav_workflows"
- android:icon="@drawable/ic_dashboard_home_web"
- android:title="All Workflows"/>
- <item
- android:id="@+id/nav_my_workflows"
- android:icon="@drawable/ic_dashboard_home_web"
- android:title="@string/my_workflows"/>
- <item
- android:id="@+id/nav_favourite_workflow"
- android:icon="@drawable/ic_star_black_24dp"
- android:title="Favourite Workflows"/>
-
- <item
- android:id="@+id/nav_openworkflow"
- android:icon="@drawable/ic_openwk_web"
- android:title="Open Workflow"/>
- <item
- android:id="@+id/nav_usage"
- android:icon="@drawable/ic_usage_web"
- android:title="Usage"/>
- <item
- android:id="@+id/nav_announcement"
- android:icon="@drawable/ic_announcement_black_24dp"
- android:title="Announcement"/>
- <item
- android:id="@+id/nav_about"
- android:icon="@drawable/ic_about_web"
- android:title="About"/>
- <item
- android:id="@+id/os_licences"
- android:icon="@drawable/ic_about_web"
- android:title="@string/os_licences"/>
- <item
- android:id="@+id/nav_settings"
- android:icon="@drawable/ic_setting_workflows_web"
- android:title="Settings"/>
- <item
- android:id="@+id/nav_logout"
- android:icon="@drawable/ic_logout_web"
- android:title="Logout"/>
- </group>
+ <group android:checkableBehavior="single">
+ <item
+ android:id="@+id/nav_workflows"
+ android:icon="@drawable/ic_dashboard_home_web"
+ android:title="All Workflows"/>
+ <item
+ android:id="@+id/nav_my_workflows"
+ android:icon="@drawable/ic_dashboard_home_web"
+ android:title="@string/my_workflows"/>
+ <item
+ android:id="@+id/nav_favourite_workflow"
+ android:icon="@drawable/ic_star_black_24dp"
+ android:title="Favourite Workflows"/>
+ <item
+ android:id="@+id/nav_usage"
+ android:icon="@drawable/ic_usage_web"
+ android:title="Usage"/>
+ <item
+ android:id="@+id/nav_announcement"
+ android:icon="@drawable/ic_announcement_black_24dp"
+ android:title="Announcement"/>
+ <item
+ android:id="@+id/nav_about"
+ android:icon="@drawable/ic_about_web"
+ android:title="About"/>
+ <item
+ android:id="@+id/os_licences"
+ android:icon="@drawable/ic_about_web"
+ android:title="@string/os_licences"/>
+ <item
+ android:id="@+id/nav_settings"
+ android:icon="@drawable/ic_setting_workflows_web"
+ android:title="Settings"/>
+ <item
+ android:id="@+id/nav_logout"
+ android:icon="@drawable/ic_logout_web"
+ android:title="Logout"/>
+ </group>
</menu>