You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@taverna.apache.org by st...@apache.org on 2016/06/08 16:02:23 UTC
[21/40] incubator-taverna-mobile git commit: add toolbar in
announcement
add toolbar in announcement
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/1e5db9dc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/1e5db9dc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/1e5db9dc
Branch: refs/heads/master
Commit: 1e5db9dcf4ed8ff2e29a991f6bb3d94e062f7105
Parents: c817f7b
Author: Admin <ku...@gmail.com>
Authored: Wed Jun 1 16:11:45 2016 +0530
Committer: Admin <ku...@gmail.com>
Committed: Wed Jun 1 16:11:45 2016 +0530
----------------------------------------------------------------------
.../mobile/ui/anouncements/AnnouncementFragment.java | 11 +++++++++++
app/src/main/res/layout/fragment_announcement.xml | 11 +++++++++++
2 files changed, 22 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/1e5db9dc/app/src/main/java/org/apache/taverna/mobile/ui/anouncements/AnnouncementFragment.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/anouncements/AnnouncementFragment.java b/app/src/main/java/org/apache/taverna/mobile/ui/anouncements/AnnouncementFragment.java
index b515b55..5ab350a 100644
--- a/app/src/main/java/org/apache/taverna/mobile/ui/anouncements/AnnouncementFragment.java
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/anouncements/AnnouncementFragment.java
@@ -6,9 +6,12 @@ import android.net.NetworkInfo;
import android.os.Bundle;
import android.support.v4.app.Fragment;
import android.support.v4.widget.SwipeRefreshLayout;
+import android.support.v7.app.ActionBar;
+import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.DefaultItemAnimator;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
+import android.support.v7.widget.Toolbar;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
@@ -72,6 +75,14 @@ public class AnnouncementFragment extends Fragment implements RecyclerItemClickL
ButterKnife.bind(this, rootView);
mMainPresenter.attachView(this);
+ Toolbar toolbar = (Toolbar) rootView.findViewById(R.id.toolbar);
+ ((AppCompatActivity) getActivity()).setSupportActionBar(toolbar);
+
+ final ActionBar ab = ((AppCompatActivity) getActivity()).getSupportActionBar();
+ if(ab!=null) {
+ ab.setHomeAsUpIndicator(R.drawable.ic_menu);
+ ab.setDisplayHomeAsUpEnabled(true);
+ }
final LinearLayoutManager layoutManager = new LinearLayoutManager(getActivity());
mRecyclerView.setLayoutManager(layoutManager);
mRecyclerView.addOnItemTouchListener(new RecyclerItemClickListner(getActivity(), this));
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/1e5db9dc/app/src/main/res/layout/fragment_announcement.xml
----------------------------------------------------------------------
diff --git a/app/src/main/res/layout/fragment_announcement.xml b/app/src/main/res/layout/fragment_announcement.xml
index baf2b0b..b1d8f15 100644
--- a/app/src/main/res/layout/fragment_announcement.xml
+++ b/app/src/main/res/layout/fragment_announcement.xml
@@ -1,14 +1,25 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout
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">
+ <android.support.v7.widget.Toolbar
+ android:id="@+id/toolbar"
+ android:layout_width="match_parent"
+ android:layout_height="?attr/actionBarSize"
+ android:background="?attr/colorPrimary"
+ android:paddingTop="@dimen/app_bar_top_padding"
+ android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
+ app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
+ />
<org.apache.taverna.mobile.utils.ScrollChildSwipeRefreshLayout
android:id="@+id/swipe_refresh"
android:layout_width="match_parent"
android:layout_height="match_parent"
+ android:layout_below="@id/toolbar"
>
<android.support.v7.widget.RecyclerView