add toolbar with home back button
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/f996f690 Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/f996f690 Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/f996f690 Branch: refs/heads/master Commit: f996f690c13f4f6d9ab0c6edb927314bfa5786e7 Parents: 3c01645 Author: Sagar <[email protected]> Authored: Fri Jul 1 16:40:37 2016 +0530 Committer: Sagar <[email protected]> Committed: Fri Jul 1 16:40:37 2016 +0530 ---------------------------------------------------------------------- .../mobile/ui/workflow/WorkflowFragment.java | 1 + .../workflowdetail/WorkflowDetailActivity.java | 21 ++++++++++++++++++++ .../res/layout/activity_detail_workflow.xml | 7 +++++++ .../res/layout/fragment_detail_workflow.xml | 1 + 4 files changed, 30 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/f996f690/app/src/main/java/org/apache/taverna/mobile/ui/workflow/WorkflowFragment.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/workflow/WorkflowFragment.java b/app/src/main/java/org/apache/taverna/mobile/ui/workflow/WorkflowFragment.java index 8365cf5..370e983 100644 --- a/app/src/main/java/org/apache/taverna/mobile/ui/workflow/WorkflowFragment.java +++ b/app/src/main/java/org/apache/taverna/mobile/ui/workflow/WorkflowFragment.java @@ -161,6 +161,7 @@ public class WorkflowFragment extends Fragment implements WorkflowMvpView, public void onItemClick(View childView, int position) { Intent intent = new Intent(getActivity(), WorkflowDetailActivity.class); intent.putExtra("id", mWorkflowList.get(position).getId()); + intent.putExtra("title",mWorkflowList.get(position).getTitle()); startActivity(intent); } http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/f996f690/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailActivity.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailActivity.java b/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailActivity.java index 7d76f0e..ed765c6 100644 --- a/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailActivity.java +++ b/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailActivity.java @@ -5,15 +5,36 @@ import org.apache.taverna.mobile.R; import android.os.Bundle; import android.support.annotation.Nullable; +import android.support.v7.app.ActionBar; import android.support.v7.app.AppCompatActivity; +import android.support.v7.widget.Toolbar; + +import butterknife.BindView; +import butterknife.ButterKnife; public class WorkflowDetailActivity extends AppCompatActivity { + @BindView(R.id.toolbar) + Toolbar mToolbar; + @Override protected void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_detail_workflow); + ButterKnife.bind(this); + + setSupportActionBar(mToolbar); + + ActionBar actionbar = getSupportActionBar(); + + if(actionbar!=null){ + actionbar.setHomeButtonEnabled(true); + actionbar.setDisplayHomeAsUpEnabled(true); + actionbar.setTitle(getIntent().getStringExtra("title")); + } + + if (savedInstanceState == null) { getSupportFragmentManager().beginTransaction() .add(R.id.frame_container http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/f996f690/app/src/main/res/layout/activity_detail_workflow.xml ---------------------------------------------------------------------- diff --git a/app/src/main/res/layout/activity_detail_workflow.xml b/app/src/main/res/layout/activity_detail_workflow.xml index 39588ae..8861e66 100644 --- a/app/src/main/res/layout/activity_detail_workflow.xml +++ b/app/src/main/res/layout/activity_detail_workflow.xml @@ -4,6 +4,13 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical"> + <android.support.v7.widget.Toolbar + xmlns:android="http://schemas.android.com/apk/res/android"; + android:id="@+id/toolbar" + android:background="?attr/colorPrimary" + android:layout_height="wrap_content" + android:layout_width="match_parent" + android:minHeight="?attr/actionBarSize"/> <FrameLayout android:id="@+id/frame_container" http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/f996f690/app/src/main/res/layout/fragment_detail_workflow.xml ---------------------------------------------------------------------- diff --git a/app/src/main/res/layout/fragment_detail_workflow.xml b/app/src/main/res/layout/fragment_detail_workflow.xml index 1322b11..a2638d1 100644 --- a/app/src/main/res/layout/fragment_detail_workflow.xml +++ b/app/src/main/res/layout/fragment_detail_workflow.xml @@ -38,6 +38,7 @@ <ImageView android:id="@+id/ivUploader" android:src="@mipmap/ic_launcher" + android:paddingLeft="10dp" android:layout_width="50dp" android:layout_height="50dp"/>
