You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@taverna.apache.org by ia...@apache.org on 2016/10/06 10:36:06 UTC
[1/4] incubator-taverna-mobile git commit: Annoucement Load More NPE
fixed
Repository: incubator-taverna-mobile
Updated Branches:
refs/heads/master 9e5fb5ac4 -> 665531ea6
Annoucement Load More NPE fixed
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/725a5e2c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/725a5e2c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/725a5e2c
Branch: refs/heads/master
Commit: 725a5e2c4576f5ffafc21b62c3dd600ec7cd939c
Parents: c8e4b19
Author: Rajan Maurya <ra...@gmail.com>
Authored: Wed Oct 5 20:48:12 2016 +0530
Committer: Rajan Maurya <ra...@gmail.com>
Committed: Wed Oct 5 20:48:12 2016 +0530
----------------------------------------------------------------------
.../ui/anouncements/AnnouncementFragment.java | 32 ++++++++++++--------
.../ui/anouncements/AnnouncementMvpView.java | 6 ++--
.../ui/anouncements/AnnouncementPresenter.java | 18 ++++++-----
app/src/main/res/values/strings.xml | 4 +++
4 files changed, 39 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/725a5e2c/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 1588fed..4b33f52 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
@@ -83,9 +83,11 @@ public class AnnouncementFragment extends Fragment implements RecyclerItemClickL
@Override
public void onItemClick(View childView, int position) {
- showWaitProgress(true);
- mAnnouncementPresenter.loadAnnouncementDetails(mAnnouncements.getAnnouncement().get
- (position).getId());
+ if (mAnnouncements.getAnnouncement().get(position) != null && position != -1) {
+ showWaitProgress(true);
+ mAnnouncementPresenter.loadAnnouncementDetails(mAnnouncements.getAnnouncement()
+ .get(position).getId());
+ }
}
@Override
@@ -132,7 +134,7 @@ public class AnnouncementFragment extends Fragment implements RecyclerItemClickL
}
} else {
Log.i(LOG_TAG, "NO Internet Connection");
- showErrorSnackBar();
+ showSnackBar(R.string.no_internet_connection);
if (mSwipeRefresh.isRefreshing()) {
mSwipeRefresh.setRefreshing(false);
}
@@ -144,7 +146,7 @@ public class AnnouncementFragment extends Fragment implements RecyclerItemClickL
showProgressbar(true);
mAnnouncementPresenter.loadAllAnnouncement(mPageNumber);
- mRecyclerView.setOnScrollListener(new EndlessRecyclerOnScrollListener(layoutManager) {
+ mRecyclerView.addOnScrollListener(new EndlessRecyclerOnScrollListener(layoutManager) {
@Override
public void onLoadMore(int current_page) {
@@ -157,7 +159,7 @@ public class AnnouncementFragment extends Fragment implements RecyclerItemClickL
Log.i(LOG_TAG, "Loading more");
} else {
Log.i(LOG_TAG, "Internet not available. Not loading more posts.");
- showErrorSnackBar();
+ showSnackBar(R.string.no_internet_connection);
}
}
});
@@ -172,13 +174,13 @@ public class AnnouncementFragment extends Fragment implements RecyclerItemClickL
@Override
- public void showAllAnouncement(Announcements announcements) {
+ public void showAllAnnouncement(Announcements announcements) {
if (mPageNumber == 1) {
mAnnouncements = announcements;
mAnnouncementAdapter = new AnnouncementAdapter(mAnnouncements.getAnnouncement());
mRecyclerView.setAdapter(mAnnouncementAdapter);
} else {
- mAnnouncements.getAnnouncement().remove(mAnnouncements.getAnnouncement().size() - 1);
+ removeLoadMoreProgressBar();
mAnnouncements.getAnnouncement().addAll(announcements.getAnnouncement());
}
@@ -190,6 +192,12 @@ public class AnnouncementFragment extends Fragment implements RecyclerItemClickL
}
@Override
+ public void removeLoadMoreProgressBar() {
+ mAnnouncements.getAnnouncement().remove(mAnnouncements.getAnnouncement().size() - 1);
+ mAnnouncementAdapter.notifyDataSetChanged();
+ }
+
+ @Override
public void showProgressbar(boolean status) {
if (status) {
mProgressBar.setVisibility(View.VISIBLE);
@@ -229,10 +237,10 @@ public class AnnouncementFragment extends Fragment implements RecyclerItemClickL
super.onResume();
}
- public void showErrorSnackBar() {
- final Snackbar snackbar = Snackbar.make(mRecyclerView, "No Internet Connection", Snackbar
- .LENGTH_LONG);
- snackbar.setAction("OK", new View.OnClickListener() {
+ @Override
+ public void showSnackBar(int message) {
+ final Snackbar snackbar = Snackbar.make(mRecyclerView, message, Snackbar.LENGTH_LONG);
+ snackbar.setAction(getResources().getString(R.string.ok), new View.OnClickListener() {
@Override
public void onClick(View view) {
snackbar.dismiss();
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/725a5e2c/app/src/main/java/org/apache/taverna/mobile/ui/anouncements/AnnouncementMvpView.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/anouncements/AnnouncementMvpView.java b/app/src/main/java/org/apache/taverna/mobile/ui/anouncements/AnnouncementMvpView.java
index e741d35..4a534bd 100644
--- a/app/src/main/java/org/apache/taverna/mobile/ui/anouncements/AnnouncementMvpView.java
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/anouncements/AnnouncementMvpView.java
@@ -25,11 +25,13 @@ import org.apache.taverna.mobile.ui.base.MvpView;
public interface AnnouncementMvpView extends MvpView {
- void showAllAnouncement(Announcements announcements);
+ void showAllAnnouncement(Announcements announcements);
+
+ void removeLoadMoreProgressBar();
void showProgressbar(boolean b);
- void showErrorSnackBar();
+ void showSnackBar(int message);
void showWaitProgress(boolean b);
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/725a5e2c/app/src/main/java/org/apache/taverna/mobile/ui/anouncements/AnnouncementPresenter.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/anouncements/AnnouncementPresenter.java b/app/src/main/java/org/apache/taverna/mobile/ui/anouncements/AnnouncementPresenter.java
index 97b9a5d..029a758 100644
--- a/app/src/main/java/org/apache/taverna/mobile/ui/anouncements/AnnouncementPresenter.java
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/anouncements/AnnouncementPresenter.java
@@ -18,13 +18,14 @@
*/
package org.apache.taverna.mobile.ui.anouncements;
+import android.util.Log;
+
+import org.apache.taverna.mobile.R;
import org.apache.taverna.mobile.data.DataManager;
import org.apache.taverna.mobile.data.model.Announcements;
import org.apache.taverna.mobile.data.model.DetailAnnouncement;
import org.apache.taverna.mobile.ui.base.BasePresenter;
-import android.util.Log;
-
import rx.Observer;
import rx.android.schedulers.AndroidSchedulers;
import rx.schedulers.Schedulers;
@@ -68,15 +69,18 @@ public class AnnouncementPresenter extends BasePresenter<AnnouncementMvpView> {
@Override
public void onError(Throwable e) {
-// Log.d(LOG_TAG,e.getMessage());
getMvpView().showProgressbar(false);
- getMvpView().showErrorSnackBar();
+ getMvpView().showSnackBar(R.string.failed_to_fetch_announcement);
}
@Override
public void onNext(Announcements announcement) {
- getMvpView().showAllAnouncement(announcement);
- Log.d(LOG_TAG, announcement.getAnnouncement().get(1).getResource());
+ if (announcement.getAnnouncement() != null) {
+ getMvpView().showAllAnnouncement(announcement);
+ } else {
+ getMvpView().showSnackBar(R.string.no_more_announcement_available);
+ getMvpView().removeLoadMoreProgressBar();
+ }
}
}));
}
@@ -96,7 +100,7 @@ public class AnnouncementPresenter extends BasePresenter<AnnouncementMvpView> {
public void onError(Throwable e) {
Log.d(LOG_TAG, e.getMessage());
getMvpView().showWaitProgress(false);
- getMvpView().showErrorSnackBar();
+ getMvpView().showSnackBar(R.string.failed_to_fetch_announcement);
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/725a5e2c/app/src/main/res/values/strings.xml
----------------------------------------------------------------------
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 14f4948..95fe89c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -33,6 +33,10 @@ limitations under the License.
<string name="loginpassword">Password</string>
<string name="bLogin">Login</string>
<string name="title_activity_dashboard_main">Dashboard</string>
+ <string name="no_internet_connection">No Internet Connection</string>
+ <string name="no_more_announcement_available">No More Announcement Available</string>
+ <string name="failed_to_fetch_announcement">Failed to fetch announcement</string>
+ <string name="ok">OK</string>
<string name="title_favorite">Favorites</string>
<string name="title_explore">Workflows</string>
[4/4] incubator-taverna-mobile git commit: This closes #31
Posted by ia...@apache.org.
This closes #31
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/665531ea
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/665531ea
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/665531ea
Branch: refs/heads/master
Commit: 665531ea6fc3566462d0809ac39b6edbd3e8c998
Parents: 9e5fb5a ba62692
Author: Ian Dunlop <ia...@manchester.ac.uk>
Authored: Thu Oct 6 11:33:12 2016 +0100
Committer: Ian Dunlop <ia...@manchester.ac.uk>
Committed: Thu Oct 6 11:33:12 2016 +0100
----------------------------------------------------------------------
.../mobile/ui/adapter/AnnouncementAdapter.java | 2 +-
.../ui/anouncements/AnnouncementFragment.java | 32 ++++---
.../ui/anouncements/AnnouncementMvpView.java | 6 +-
.../ui/anouncements/AnnouncementPresenter.java | 18 ++--
.../FavouriteWorkflowDetailFragment.java | 2 +-
.../mobile/ui/imagezoom/ImageZoomFragment.java | 2 +-
.../ui/playerlogin/PlayerLoginFragment.java | 2 +-
.../workflowdetail/WorkflowDetailFragment.java | 2 +-
app/src/main/res/layout/item_announcement.xml | 59 ++++++++++++
app/src/main/res/layout/item_recyclerview.xml | 53 -----------
app/src/main/res/values/dimens.xml | 4 +
app/src/main/res/values/strings.xml | 94 ++++++++++++++------
12 files changed, 170 insertions(+), 106 deletions(-)
----------------------------------------------------------------------
[2/4] incubator-taverna-mobile git commit: Announcement UI enhanced
Posted by ia...@apache.org.
Announcement UI enhanced
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/b2fb6c16
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/b2fb6c16
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/b2fb6c16
Branch: refs/heads/master
Commit: b2fb6c167b23eee99bb4025c29236df071bddc21
Parents: 725a5e2
Author: Rajan Maurya <ra...@gmail.com>
Authored: Wed Oct 5 21:01:22 2016 +0530
Committer: Rajan Maurya <ra...@gmail.com>
Committed: Wed Oct 5 21:01:22 2016 +0530
----------------------------------------------------------------------
.../mobile/ui/adapter/AnnouncementAdapter.java | 2 +-
app/src/main/res/layout/item_announcement.xml | 59 ++++++++++++++++++++
app/src/main/res/layout/item_recyclerview.xml | 53 ------------------
app/src/main/res/values/dimens.xml | 4 ++
4 files changed, 64 insertions(+), 54 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/b2fb6c16/app/src/main/java/org/apache/taverna/mobile/ui/adapter/AnnouncementAdapter.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/adapter/AnnouncementAdapter.java b/app/src/main/java/org/apache/taverna/mobile/ui/adapter/AnnouncementAdapter.java
index 328abd5..70b91af 100644
--- a/app/src/main/java/org/apache/taverna/mobile/ui/adapter/AnnouncementAdapter.java
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/adapter/AnnouncementAdapter.java
@@ -54,7 +54,7 @@ public class AnnouncementAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
RecyclerView.ViewHolder vh;
if (viewType == VIEW_ITEM) {
View v = LayoutInflater.from(parent.getContext()).inflate(
- R.layout.item_recyclerview, parent, false);
+ R.layout.item_announcement, parent, false);
vh = new ViewHolder(v);
} else {
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/b2fb6c16/app/src/main/res/layout/item_announcement.xml
----------------------------------------------------------------------
diff --git a/app/src/main/res/layout/item_announcement.xml b/app/src/main/res/layout/item_announcement.xml
new file mode 100644
index 0000000..a5dd5d6
--- /dev/null
+++ b/app/src/main/res/layout/item_announcement.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<android.support.v7.widget.CardView
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ android:id="@+id/cv"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginBottom="@dimen/announcementCardMarginVertical"
+ android:layout_marginLeft="@dimen/announcementCardMarginHorizontal"
+ android:layout_marginRight="@dimen/announcementCardMarginHorizontal"
+ android:layout_marginTop="@dimen/announcementCardMarginVertical"
+ app:cardCornerRadius="2dp"
+ app:cardElevation="2pt">
+
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal">
+
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ android:layout_marginLeft="10dp"
+ android:layout_marginStart="10dp"
+ android:src="@drawable/ic_announcement_black_24dp"/>
+
+ <TextView
+ android:id="@+id/textview_announcement"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:gravity="left"
+ android:paddingBottom="5dp"
+ android:paddingLeft="10dp"
+ android:paddingStart="10dp"
+ android:paddingTop="5dp"
+ android:text="111111"
+ android:textColor="@android:color/black"
+ android:textSize="16sp"/>
+
+ </LinearLayout>
+
+</android.support.v7.widget.CardView>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/b2fb6c16/app/src/main/res/layout/item_recyclerview.xml
----------------------------------------------------------------------
diff --git a/app/src/main/res/layout/item_recyclerview.xml b/app/src/main/res/layout/item_recyclerview.xml
deleted file mode 100644
index 23f3389..0000000
--- a/app/src/main/res/layout/item_recyclerview.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<android.support.v7.widget.CardView
- android:id="@+id/cv"
- 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="wrap_content"
- app:cardCornerRadius="2dp"
- app:cardElevation="2pt"
- >
- <LinearLayout
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:orientation="horizontal"
- >
- <ImageView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center"
- android:layout_marginLeft="10dp"
- android:layout_marginStart="10dp"
- android:src="@drawable/ic_announcement_black_24dp"/>
- <TextView
- android:id="@+id/textview_announcement"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:paddingLeft="10dp"
- android:paddingStart="10dp"
- android:gravity="left"
- android:paddingTop="5dp"
- android:paddingBottom="5dp"
- android:text="111111"
- android:textSize="16sp"
- android:textColor="@android:color/black"
- />
- </LinearLayout>
-</android.support.v7.widget.CardView>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/b2fb6c16/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 43778ec..bc2312b 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -20,6 +20,10 @@ limitations under the License.
<dimen name="cardMarginHorizontal">10dp</dimen>
<dimen name="cardMarginVertical">8dp</dimen>
+ <!--Announcement Card margin-->
+ <dimen name="announcementCardMarginHorizontal">5dp</dimen>
+ <dimen name="announcementCardMarginVertical">4dp</dimen>
+
<!-- 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>
[3/4] incubator-taverna-mobile git commit: String.xml managed..
Posted by ia...@apache.org.
String.xml managed..
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/ba62692a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/ba62692a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/ba62692a
Branch: refs/heads/master
Commit: ba62692a5971f0655b23e7dfacd2a2fda09364c4
Parents: b2fb6c1
Author: Rajan Maurya <ra...@gmail.com>
Authored: Wed Oct 5 21:58:48 2016 +0530
Committer: Rajan Maurya <ra...@gmail.com>
Committed: Wed Oct 5 21:58:48 2016 +0530
----------------------------------------------------------------------
.../FavouriteWorkflowDetailFragment.java | 2 +-
.../mobile/ui/imagezoom/ImageZoomFragment.java | 2 +-
.../ui/playerlogin/PlayerLoginFragment.java | 2 +-
.../workflowdetail/WorkflowDetailFragment.java | 2 +-
app/src/main/res/values/strings.xml | 92 ++++++++++++++------
5 files changed, 68 insertions(+), 32 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/ba62692a/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflowdetail/FavouriteWorkflowDetailFragment.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflowdetail/FavouriteWorkflowDetailFragment.java b/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflowdetail/FavouriteWorkflowDetailFragment.java
index ae6fd1c..2a53536 100644
--- a/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflowdetail/FavouriteWorkflowDetailFragment.java
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflowdetail/FavouriteWorkflowDetailFragment.java
@@ -164,7 +164,7 @@ public class FavouriteWorkflowDetailFragment extends Fragment
} else {
mProgressBar.setVisibility(View.GONE);
- showErrorSnackBar(getString(R.string.no_internet));
+ showErrorSnackBar(getString(R.string.no_internet_connection));
}
setHasOptionsMenu(true);
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/ba62692a/app/src/main/java/org/apache/taverna/mobile/ui/imagezoom/ImageZoomFragment.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/imagezoom/ImageZoomFragment.java b/app/src/main/java/org/apache/taverna/mobile/ui/imagezoom/ImageZoomFragment.java
index 4caf6db..8fab037 100644
--- a/app/src/main/java/org/apache/taverna/mobile/ui/imagezoom/ImageZoomFragment.java
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/imagezoom/ImageZoomFragment.java
@@ -119,7 +119,7 @@ public class ImageZoomFragment extends Fragment implements ImageZoomMvpView {
mImageZoomPresenter.loadImage(svgURI, workflowImage);
} else {
- showErrorSnackBar(getString(R.string.no_internet));
+ showErrorSnackBar(getString(R.string.no_internet_connection));
}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/ba62692a/app/src/main/java/org/apache/taverna/mobile/ui/playerlogin/PlayerLoginFragment.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/playerlogin/PlayerLoginFragment.java b/app/src/main/java/org/apache/taverna/mobile/ui/playerlogin/PlayerLoginFragment.java
index 324d2a6..90d4242 100644
--- a/app/src/main/java/org/apache/taverna/mobile/ui/playerlogin/PlayerLoginFragment.java
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/playerlogin/PlayerLoginFragment.java
@@ -128,7 +128,7 @@ public class PlayerLoginFragment extends Fragment implements PlayerLoginMvpView,
}
} else {
- showError(R.string.no_internet);
+ showError(R.string.no_internet_connection);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/ba62692a/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailFragment.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailFragment.java b/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailFragment.java
index f1f4a86..f2e6a63 100644
--- a/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailFragment.java
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailFragment.java
@@ -159,7 +159,7 @@ public class WorkflowDetailFragment extends Fragment implements WorkflowDetailMv
} else {
mProgressBar.setVisibility(View.GONE);
- showErrorSnackBar(getString(R.string.no_internet));
+ showErrorSnackBar(getString(R.string.no_internet_connection));
}
setHasOptionsMenu(true);
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/ba62692a/app/src/main/res/values/strings.xml
----------------------------------------------------------------------
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 95fe89c..8e531ae 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -14,26 +14,25 @@ limitations under the License.
-->
<resources>
<string name="app_name">Taverna Mobile</string>
- <string name="hello_world"> Empty </string>
+ <string name="hello_world">Empty</string>
<string name="action_settings">Settings</string>
<string name="title_activity_flash_screen">Taverna Mobile</string>
<string name="brand">Powered By MyExperiment</string>
<string-array name="menus">
- <item >Usage</item>
+ <item>Usage</item>
<item>Quit</item>
</string-array>
<array name="workflow_info">
- <item >Date Created</item>
+ <item>Date Created</item>
<item>Date Modified</item>
<item>Date Last Run</item>
</array>
- <string name="hello_blank_fragment"> About Workflow </string>
+ <string name="hello_blank_fragment">About Workflow</string>
<string name="logininfo">myExperiment Login</string>
<string name="loginusername">Email or Username</string>
<string name="loginpassword">Password</string>
<string name="bLogin">Login</string>
<string name="title_activity_dashboard_main">Dashboard</string>
- <string name="no_internet_connection">No Internet Connection</string>
<string name="no_more_announcement_available">No More Announcement Available</string>
<string name="failed_to_fetch_announcement">Failed to fetch announcement</string>
<string name="ok">OK</string>
@@ -41,23 +40,31 @@ limitations under the License.
<string name="title_favorite">Favorites</string>
<string name="title_explore">Workflows</string>
<string name="title_usage">Usage</string>
- <string name="title_about">About </string>
+ <string name="title_about">About</string>
<string name="title_exit">Logout</string>
<string name="title_openworkflow">Open Workflow</string>
<string name="menu_search">Search</string>
<string name="action_example">Example action</string>
- <string name="completebrand">Powered by <a href="http://taverna.incubator.apache.org">Apache Taverna</a></string>
- <string name="search_hint"> Search workflows by name</string>
+ <string name="completebrand">Powered by
+ <a href="http://taverna.incubator.apache.org">Apache Taverna</a>
+ </string>
+ <string name="search_hint">Search workflows by name</string>
<string name="workflow_download">Download</string>
<string name="workflow_read">View</string>
<string name="workflow_mark">Favorite</string>
- <string name="workflow_authorhint">Workflow Author </string>
+ <string name="workflow_authorhint">Workflow Author</string>
<string name="workflow_component">Workflow component</string>
- <string name="favorite_empty"> No Favorites Added Yet</string>
- <string name="workflow_empty"> No <b>Workflows</b> Available. Pull down to refresh (or check your internet connection)</string>
- <string name="workflow_run_empty"> <b>Workflows History</b> empty. No runs have been created for this workflow</string>
+ <string name="favorite_empty">No Favorites Added Yet</string>
+ <string name="workflow_empty">No
+ <b>Workflows</b>
+ Available. Pull down to refresh (or check your internet connection)
+ </string>
+ <string name="workflow_run_empty">
+ <b>Workflows History</b>
+ empty. No runs have been created for this workflow
+ </string>
<string name="wktitle">TITLE</string>
<string name="marked">Marked On</string>
<string name="workflow_type_text">Type: %1$s</string>
@@ -68,30 +75,37 @@ limitations under the License.
<string name="title_activity_workflow_detail">Workflow Detail</string>
- <string name="detail_title_section1">Workflow </string>
+ <string name="detail_title_section1">Workflow</string>
<string name="detail_title_section2">Run History</string>
<string name="detail_title_section3">Licence | Policy</string>
- <string name="detail_title_section4"> About </string>
+ <string name="detail_title_section4">About</string>
<string name="play_workflow">Create Run</string>
- <string name="err_workflow_conn">Unable to fetch latest workflows. Please check your network connection</string>
-
+ <string name="err_workflow_conn">Unable to fetch latest workflows. Please check your network
+ connection
+ </string>
+
<string name="downloadfailed">Download Failed. Please try again</string>
<string name="downloadprogress">Workflow download in progress</string>
- <string name="downloaderror">Unable to start Download. Please check your internet connection</string>
+ <string name="downloaderror">Unable to start Download. Please check your internet connection
+ </string>
<string name="downloadduplicate">Already Downloading</string>
- <string name="downloadcomplete"> download complete</string>
- <string name="seemore"> More Info &raquo</string>
+ <string name="downloadcomplete">download complete</string>
+ <string name="seemore">More Info &raquo</string>
<string name="loading">Loading details</string>
<string name="loadworkflows">Loading Workflows</string>
- <string name="fetchrun">Fetching run components </string>
+ <string name="fetchrun">Fetching run components</string>
<string name="keeplogin">Remain Logged-in</string>
-
+
<string name="emailerr">Username must not be empty</string>
<string name="passworderr">Password must not be empty</string>
<string name="version_number">v1.0</string>
- <string name="about">Mobile Application for managing Taverna workflows.\n\nCopyright � 2015–2016 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.</string>
+ <string name="about">Mobile Application for managing Taverna workflows.\n\nCopyright � 2015–2016
+ The Apache Software Foundation, Licensed under the Apache License, Version 2.0.
+ </string>
<string name="about2">View, run and download workflows on your Android mobile device.</string>
- <string name="about3">Originally developed during Google Summer of Code 2015 for the <a href="http://taverna.incubator.apache.org">Apache Taverna project</a>.</string>
+ <string name="about3">Originally developed during Google Summer of Code 2015 for the<a
+ href="http://taverna.incubator.apache.org">Apache Taverna project</a>.
+ </string>
<string name="playerconfig">Configure Player Account</string>
<string name="playerconfig_summary">Username used to login to Taverna player portal</string>
<string name="playeruser">Username/email</string>
@@ -104,17 +118,39 @@ limitations under the License.
<string name="runstarted">Run Started</string>
<string name="run_finishtime">Run finish Time</string>
<string name="usage_intro">Usage | Login</string>
- <string name="usage_login_accounts">When the app is started you are initially prompted with an accounts page to login. Use Your myExperiment account to login. You will need to configure a Taverna player account in the settings when you have successfully logged-in to the app. you can also choose to remain logged-in or not from the login page.</string>
+ <string name="usage_login_accounts">When the app is started you are initially prompted with an
+ accounts page to login. Use Your myExperiment account to login. You will need to configure a
+ Taverna player account in the settings when you have successfully logged-in to the app. you
+ can also choose to remain logged-in or not from the login page.
+ </string>
<string name="usage_dashboard">Usage | Dashboard</string>
- <string name="usage_dashboard_Text">Once logged-in to the app, a stream of workflows appears as a stream from which you could view, mark workflows for offline viewing. There are two tabs on the dashboard, the second tab presents a list of marked workflows. there is a menu button the pulls out a navigation drawer menu from the left corner of the dashboard. You can also swipe finger from the extreme left of the screen to pull out the menu. Scrolling to the bottom of the workflow screen will load more workflows. You can pull down to refresh workflows for the initial workflow list. the search bar is used to fetch amongst currently loaded workflows.</string>
+ <string name="usage_dashboard_Text">Once logged-in to the app, a stream of workflows appears as
+ a stream from which you could view, mark workflows for offline viewing. There are two tabs
+ on the dashboard, the second tab presents a list of marked workflows. there is a menu button
+ the pulls out a navigation drawer menu from the left corner of the dashboard. You can also
+ swipe finger from the extreme left of the screen to pull out the menu. Scrolling to the
+ bottom of the workflow screen will load more workflows. You can pull down to refresh
+ workflows for the initial workflow list. the search bar is used to fetch amongst currently
+ loaded workflows.
+ </string>
<string name="usage_menus">Usage | Menus</string>
- <string name="usage_menu_Text">The navigation drawer brings up a menu. The workflow menu item allows one to quickly return to the workflow streams page from any screen. The \'Open Workflow\' item allows users to pick a valid workflow from external storage and run it against a Taverna Server through a Taverna Player. Settings allow user to configure player accounts and portal urls. Logout allows users to log-out of the app</string>
+ <string name="usage_menu_Text">The navigation drawer brings up a menu. The workflow menu item
+ allows one to quickly return to the workflow streams page from any screen. The \'Open
+ Workflow\' item allows users to pick a valid workflow from external storage and run it
+ against a Taverna Server through a Taverna Player. Settings allow user to configure player
+ accounts and portal urls. Logout allows users to log-out of the app
+ </string>
<string name="usage_detail">Usage | Workfow Detail</string>
- <string name="usage_detail_text">The details screen allows users to run particular worklows and provides detailed information about the workflows. Workflows can also be downloaded from here. Workflows can also be marked from this screen which would save much more data for offline use than on the dashboard screen. This screen also provides a set of runs for the workflow from other users</string>
+ <string name="usage_detail_text">The details screen allows users to run particular worklows and
+ provides detailed information about the workflows. Workflows can also be downloaded from
+ here. Workflows can also be marked from this screen which would save much more data for
+ offline use than on the dashboard screen. This screen also provides a set of runs for the
+ workflow from other users
+ </string>
<string name="runid_text">Workflow Run ID:</string>
<string name="announcement">Announcementss</string>
- <string name="no_internet">No Internet Connection</string>
+ <string name="no_internet_connection">No Internet Connection</string>
<string name="licence">Licence</string>
<string name="no_favourite_workflow_found">No Favourite Workflow Found!!!</string>
<string name="image_zoom">Image Zoom</string>