add toolbar and remove viewpager from onCreate
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/fae286a5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/fae286a5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/fae286a5 Branch: refs/heads/master Commit: fae286a5f9e0b7389862acac695c54104c64e72c Parents: 7c00a86 Author: Sagar <[email protected]> Authored: Sun Jul 10 00:31:44 2016 +0530 Committer: Sagar <[email protected]> Committed: Sun Jul 10 00:31:44 2016 +0530 ---------------------------------------------------------------------- .../activities/DashboardMainActivity.java | 20 +++++--- .../main/res/layout/activity_dashboard_main.xml | 53 ++++++++++---------- 2 files changed, 41 insertions(+), 32 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/fae286a5/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 ad31a28..6e9cb77 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,9 +26,8 @@ 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.favouriteworkflow.FavouriteWorkflowsFragment; import org.apache.taverna.mobile.ui.workflow.WorkflowFragment; import org.apache.taverna.mobile.utils.WorkflowOpen; @@ -48,6 +47,7 @@ import android.support.v4.view.GravityCompat; import android.support.v4.widget.DrawerLayout; import android.support.v7.app.ActionBar; import android.support.v7.app.AppCompatActivity; +import android.support.v7.widget.Toolbar; import android.view.Menu; import android.view.MenuItem; import android.webkit.MimeTypeMap; @@ -83,6 +83,16 @@ public class DashboardMainActivity extends AppCompatActivity { setUpWorkflowDirectory(this); aboutDialog = new Dialog(this); + Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); + setSupportActionBar(toolbar); + + final ActionBar ab = getSupportActionBar(); + if(ab !=null) { + ab.setHomeAsUpIndicator(R.drawable.ic_menu); + ab.setDisplayHomeAsUpEnabled(true); + } + + /** * Setting the Fragment in FrameLayout */ @@ -91,13 +101,11 @@ public class DashboardMainActivity extends AppCompatActivity { FragmentManager fragmentManager = getSupportFragmentManager(); Fragment fragment; - fragment = new WorkflowViewpager(); + fragment = new WorkflowFragment(); fragmentManager.beginTransaction() .replace(R.id.frame_container, fragment) .setTransition(FragmentTransaction.TRANSIT_FRAGMENT_CLOSE) .commit(); - - } } @@ -132,7 +140,7 @@ public class DashboardMainActivity extends AppCompatActivity { case R.id.nav_favourite_workflow: - fragment = new FavoriteFragment(); + fragment = new FavouriteWorkflowsFragment(); fragmentManager.beginTransaction() .replace(R.id.frame_container, fragment) .setTransition(FragmentTransaction.TRANSIT_FRAGMENT_CLOSE) http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/fae286a5/app/src/main/res/layout/activity_dashboard_main.xml ---------------------------------------------------------------------- diff --git a/app/src/main/res/layout/activity_dashboard_main.xml b/app/src/main/res/layout/activity_dashboard_main.xml index a6fd6a5..54982fc 100644 --- a/app/src/main/res/layout/activity_dashboard_main.xml +++ b/app/src/main/res/layout/activity_dashboard_main.xml @@ -14,34 +14,35 @@ limitations under the License. --> <!-- A DrawerLayout is intended to be used as the top-level content view using match_parent for both width and height to consume the full space available. --> <android.support.v4.widget.DrawerLayout - android:id="@+id/drawer_layout" - xmlns:android="http://schemas.android.com/apk/res/android"; - xmlns:app="http://schemas.android.com/apk/res-auto"; - android:layout_width="match_parent" - android:layout_height="match_parent" - > + xmlns:android="http://schemas.android.com/apk/res/android"; + xmlns:app="http://schemas.android.com/apk/res-auto"; + android:id="@+id/drawer_layout" + android:layout_width="match_parent" + android:layout_height="match_parent" +> - <LinearLayout - xmlns:android="http://schemas.android.com/apk/res/android"; - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical"> + <LinearLayout + xmlns:android="http://schemas.android.com/apk/res/android"; + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical"> + <include + layout="@layout/appbar"/> + <FrameLayout + android:id="@+id/frame_container" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_weight="1"/> - <FrameLayout - android:id="@+id/frame_container" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_weight="1"/> + </LinearLayout> - </LinearLayout> - - <android.support.design.widget.NavigationView - android:id="@+id/nav_view" - android:layout_width="wrap_content" - android:layout_height="match_parent" - android:layout_gravity="start" - android:fitsSystemWindows="true" - app:headerLayout="@layout/nav_header" - app:menu="@menu/drawer_view"/> + <android.support.design.widget.NavigationView + android:id="@+id/nav_view" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:layout_gravity="start" + android:fitsSystemWindows="true" + app:headerLayout="@layout/nav_header" + app:menu="@menu/drawer_view"/> </android.support.v4.widget.DrawerLayout>
