Repository: incubator-taverna-mobile Updated Branches: refs/heads/master d73dc2005 -> a90f32eb1
reposition favourite workflows to navigation drawer menu 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/77b4704e Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/77b4704e Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/77b4704e Branch: refs/heads/master Commit: 77b4704e5ab8a9ec0dc0c7e6441c378e0bc10fb9 Parents: d73dc20 Author: Sagar <[email protected]> Authored: Fri Jul 8 22:35:37 2016 +0530 Committer: Sagar <[email protected]> Committed: Fri Jul 8 22:35:37 2016 +0530 ---------------------------------------------------------------------- .../mobile/activities/DashboardMainActivity.java | 19 +++++++++++++++++-- app/src/main/res/menu/drawer_view.xml | 8 +++++++- 2 files changed, 24 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/77b4704e/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 6ec84d8..ad31a28 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 @@ -26,8 +26,10 @@ package org.apache.taverna.mobile.activities; */ import org.apache.taverna.mobile.R; +import org.apache.taverna.mobile.fragments.FavoriteFragment; import org.apache.taverna.mobile.fragments.WorkflowViewpager; import org.apache.taverna.mobile.ui.anouncements.AnnouncementFragment; +import org.apache.taverna.mobile.ui.workflow.WorkflowFragment; import org.apache.taverna.mobile.utils.WorkflowOpen; import android.app.Dialog; @@ -116,9 +118,9 @@ public class DashboardMainActivity extends AppCompatActivity { Fragment fragment; switch (menuItem.getItemId()) { - case R.id.nav_dashboard: + case R.id.nav_workflows: - fragment = new WorkflowViewpager(); + fragment = new WorkflowFragment(); fragmentManager.beginTransaction() .replace(R.id.frame_container, fragment) .setTransition(FragmentTransaction.TRANSIT_FRAGMENT_CLOSE) @@ -127,6 +129,19 @@ public class DashboardMainActivity extends AppCompatActivity { menuItem.setChecked(true); mDrawerLayout.closeDrawers(); return true; + + case R.id.nav_favourite_workflow: + + fragment = new FavoriteFragment(); + fragmentManager.beginTransaction() + .replace(R.id.frame_container, fragment) + .setTransition(FragmentTransaction.TRANSIT_FRAGMENT_CLOSE) + .commit(); + + menuItem.setChecked(true); + mDrawerLayout.closeDrawers(); + return true; + case R.id.nav_announcement: fragment = new AnnouncementFragment(); http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/77b4704e/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 f56e06d..47b451b 100644 --- a/app/src/main/res/menu/drawer_view.xml +++ b/app/src/main/res/menu/drawer_view.xml @@ -18,9 +18,15 @@ <group android:checkableBehavior="single"> <item - android:id="@+id/nav_dashboard" + android:id="@+id/nav_workflows" android:icon="@drawable/ic_dashboard_home_web" android:title="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"
