add announcement nav item
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/e089771a Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/e089771a Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/e089771a Branch: refs/heads/master Commit: e089771aee6ab15d8c61bd7134fe22e7821b69cc Parents: 5b5f644 Author: Sagar <[email protected]> Authored: Fri May 6 17:04:29 2016 +0530 Committer: Sagar <[email protected]> Committed: Fri May 6 17:04:29 2016 +0530 ---------------------------------------------------------------------- .../activities/DashboardMainActivity.java | 17 +++++-- .../apache/taverna/mobile/data/DataManager.java | 4 +- .../taverna/mobile/data/model/Announcement.java | 48 -------------------- app/src/main/res/menu/drawer_view.xml | 4 ++ app/src/main/res/values/dimens.xml | 1 + 5 files changed, 20 insertions(+), 54 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/e089771a/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 ff26cb5..1d74cbd 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.graphics.Color; import android.net.Uri; import android.os.Bundle; import android.os.Environment; @@ -44,14 +43,13 @@ import android.support.v7.app.ActionBar; import android.support.v7.app.AppCompatActivity; import android.view.Menu; import android.view.MenuItem; -import android.view.View; import android.webkit.MimeTypeMap; -import android.widget.RelativeLayout; import android.widget.TableLayout; -import android.widget.TextView; import android.widget.Toast; + import org.apache.taverna.mobile.R; import org.apache.taverna.mobile.fragments.Workflow_viewpager; +import org.apache.taverna.mobile.ui.anouncements.AnnouncementFragment; import org.apache.taverna.mobile.utils.WorkflowOpen; import java.io.File; @@ -134,6 +132,17 @@ public class DashboardMainActivity extends AppCompatActivity menuItem.setChecked(true); mDrawerLayout.closeDrawers(); return true; + case R.id.nav_announcement: + + fragment = new AnnouncementFragment(); + 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_openworkflow: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/e089771a/app/src/main/java/org/apache/taverna/mobile/data/DataManager.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/taverna/mobile/data/DataManager.java b/app/src/main/java/org/apache/taverna/mobile/data/DataManager.java index 1818110..a304b46 100644 --- a/app/src/main/java/org/apache/taverna/mobile/data/DataManager.java +++ b/app/src/main/java/org/apache/taverna/mobile/data/DataManager.java @@ -17,7 +17,7 @@ public class DataManager { * * @return List of all Announcement */ - public Observable<Announcements> getAllAnnouncement(){ - return mBaseApiManager.getTavernaApi().getAllAnnouncements(); + public Observable<Announcements> getAllAnnouncement(int pageNumber){ + return mBaseApiManager.getTavernaApi().getAllAnnouncements(pageNumber); } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/e089771a/app/src/main/java/org/apache/taverna/mobile/data/model/Announcement.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/taverna/mobile/data/model/Announcement.java b/app/src/main/java/org/apache/taverna/mobile/data/model/Announcement.java deleted file mode 100644 index 755b6f9..0000000 --- a/app/src/main/java/org/apache/taverna/mobile/data/model/Announcement.java +++ /dev/null @@ -1,48 +0,0 @@ -package org.apache.taverna.mobile.data.model; - -public class Announcement { - private String id; - - private String content; - - private String resource; - - private String uri; - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getContent() { - return content; - } - - public void setContent(String content) { - this.content = content; - } - - public String getResource() { - return resource; - } - - public void setResource(String resource) { - this.resource = resource; - } - - public String getUri() { - return uri; - } - - public void setUri(String uri) { - this.uri = uri; - } - - @Override - public String toString() { - return "ClassPojo [id = " + id + ", content = " + content + ", resource = " + resource + ", uri = " + uri + "]"; - } -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/e089771a/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 57c4164..d8fa5f8 100644 --- a/app/src/main/res/menu/drawer_view.xml +++ b/app/src/main/res/menu/drawer_view.xml @@ -30,6 +30,10 @@ android:icon="@drawable/ic_usage_web" android:title="Usage"/> <item + android:id="@+id/nav_announcement" + android:icon="@drawable/ic_logout_web" + android:title="Announcement"/> + <item android:id="@+id/nav_about" android:icon="@drawable/ic_about_web" android:title="About"/> http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/e089771a/app/src/main/res/values/dimens.xml ---------------------------------------------------------------------- diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index 4c50bfc..20dc847 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -23,4 +23,5 @@ limitations under the License. <!-- Per the design guidelines, navigation drawers should be between 240dp and 320dp: https://developer.android.com/design/patterns/navigation-drawer.html --> <dimen name="navigation_drawer_width">240dp</dimen> + <dimen name="item_offset">3dp</dimen> </resources>
