incubator-taverna-mobile git commit: Changed some of the Toast messages. Removed some unused UI parts.

[ianwdunlop]

Repository: incubator-taverna-mobile
Updated Branches:
  refs/heads/master b0a31823f -> 046a4b259


Changed some of the Toast messages. Removed some unused UI parts.


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/046a4b25
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/046a4b25
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/046a4b25

Branch: refs/heads/master
Commit: 046a4b2596d43177110f2567c5b63aa3b7e9aee5
Parents: b0a3182
Author: Ian Dunlop 
Authored: Thu Apr 28 17:09:41 2016 +0100
Committer: Ian Dunlop 
Committed: Thu Apr 28 17:09:41 2016 +0100

--
 .../mobile/adapters/WorkflowAdapter.java|  5 ++--
 .../workflowdetails/WorkflowdetailFragment.java | 27 +---
 .../res/layout/fragment_workflow_detail.xml |  7 ++---
 3 files changed, 24 insertions(+), 15 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/046a4b25/app/src/main/java/org/apache/taverna/mobile/adapters/WorkflowAdapter.java
--
diff --git 
a/app/src/main/java/org/apache/taverna/mobile/adapters/WorkflowAdapter.java 
b/app/src/main/java/org/apache/taverna/mobile/adapters/WorkflowAdapter.java
index 8cecae7..1394422 100644
--- a/app/src/main/java/org/apache/taverna/mobile/adapters/WorkflowAdapter.java
+++ b/app/src/main/java/org/apache/taverna/mobile/adapters/WorkflowAdapter.java
@@ -214,9 +214,9 @@ public class WorkflowAdapter extends 
RecyclerView.Adapterhttp://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/046a4b25/app/src/main/java/org/apache/taverna/mobile/fragments/workflowdetails/WorkflowdetailFragment.java
--
diff --git 
a/app/src/main/java/org/apache/taverna/mobile/fragments/workflowdetails/WorkflowdetailFragment.java
 
b/app/src/main/java/org/apache/taverna/mobile/fragments/workflowdetails/WorkflowdetailFragment.java
index af37235..c7ac0ee 100644
--- 
a/app/src/main/java/org/apache/taverna/mobile/fragments/workflowdetails/WorkflowdetailFragment.java
+++ 
b/app/src/main/java/org/apache/taverna/mobile/fragments/workflowdetails/WorkflowdetailFragment.java
@@ -196,9 +196,14 @@ public class WorkflowdetailFragment extends Fragment 
implements View.OnClickList
  *
  * @param activity
  */
+//@Override
+//public void onAttach(Activity activity) {
+//super.onAttach(activity);
+//cont = getActivity();
+//}
 @Override
-public void onAttach(Activity activity) {
-super.onAttach(activity);
+public void onAttach(Context context) {
+super.onAttach(context);
 cont = getActivity();
 }
 
@@ -209,7 +214,7 @@ public class WorkflowdetailFragment extends Fragment 
implements View.OnClickList
 if 
(((TextView)rootView.findViewById(R.id.wtype)).getText().toString().contains("Taverna
 2"))
 new 
WorkflowProcessTask(getActivity()).execute(download_url);
 else
-Toast.makeText(getActivity(), "Sorry! only Type 2 
workflows can be run as of now.", Toast.LENGTH_LONG).show();
+Toast.makeText(getActivity(), "Sorry! Only Taverna 2 
workflows can be run.", Toast.LENGTH_LONG).show();
 break;
 case R.id.download_wk:
 // start the android Download manager to start downloading a 
remote workflow file
@@ -242,7 +247,7 @@ public class WorkflowdetailFragment extends Fragment 
implements View.OnClickList
  
view.setBackgroundResource(R.drawable.abc_list_selector_disabled_holo_light);
 
 }else if(result == -1){
-Toast.makeText(getActivity(),"sorry!, this workflow has 
already been marked as favorite",Toast.LENGTH_SHORT).show();
+Toast.makeText(getActivity(),"Sorry! This workflow has 
already been marked as a favourite",Toast.LENGTH_SHORT).show();
 }else
 Toast.makeText(getActivity(),"Error!, please try 
again",Toast.LENGTH_SHORT).show();
 break;
@@ -314,7 +319,7 @@ public class WorkflowdetailFragment extends Fragment 
implements View.OnClickList
 public static void setWorkflowDetails(final Workflow wk){
 currentWorkflow = wk;
 final TextView author = (TextView) 
rootView.findViewById(R.id.wkf_author);
-final TextView updated = (TextView) 
rootView.findViewById(R.id.wupdatedat);
+//final TextView updated = (TextView) 
rootView.findViewById(R.id.wupdatedat);
 final TextView type = (TextView) rootView.findViewById(R.id.wtype);
 final TextView title = (TextView) rootView.findViewById(R.id.w

incubator-taverna-mobile git commit: Use android resources to insert string using placeholders

[ianwdunlop]

Repository: incubator-taverna-mobile
Updated Branches:
  refs/heads/master 046a4b259 -> 72af3752d


Use android resources to insert string using placeholders


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/72af3752
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/72af3752
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/72af3752

Branch: refs/heads/master
Commit: 72af3752da7502aa17676aa0a562124ef0a4ec87
Parents: 046a4b2
Author: Ian Dunlop 
Authored: Thu Apr 28 20:39:08 2016 +0100
Committer: Ian Dunlop 
Committed: Thu Apr 28 20:39:08 2016 +0100

--
 .../fragments/workflowdetails/WorkflowdetailFragment.java  | 6 +-
 app/src/main/res/values/strings.xml| 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/72af3752/app/src/main/java/org/apache/taverna/mobile/fragments/workflowdetails/WorkflowdetailFragment.java
--
diff --git 
a/app/src/main/java/org/apache/taverna/mobile/fragments/workflowdetails/WorkflowdetailFragment.java
 
b/app/src/main/java/org/apache/taverna/mobile/fragments/workflowdetails/WorkflowdetailFragment.java
index c7ac0ee..0a98a8d 100644
--- 
a/app/src/main/java/org/apache/taverna/mobile/fragments/workflowdetails/WorkflowdetailFragment.java
+++ 
b/app/src/main/java/org/apache/taverna/mobile/fragments/workflowdetails/WorkflowdetailFragment.java
@@ -34,6 +34,7 @@ import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.Loader;
 import android.content.SharedPreferences;
+import android.content.res.Resources;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.net.Uri;
@@ -340,7 +341,10 @@ public class WorkflowdetailFragment extends Fragment 
implements View.OnClickList
 } else {
 //desc.setVisibility(View.INVISIBLE); //Not sure I trust 
this! Needs investigating.
 }
-createdat.setText("Created : " + wk.getWorkflow_datecreated());
+//Use android resources to insert text into placeholder
+Resources resources = cont.getResources();
+String createdAtText = 
String.format(resources.getString(R.string.created), 
wk.getWorkflow_datecreated());
+createdat.setText(createdAtText);
 //updated.setText("Workflow Description");
 type.setText("Type: "+wk.getWorkflow_Type());
 

http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/72af3752/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 5b9bf59..cb68e91 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -56,7 +56,7 @@ limitations under the License.
  Workflows History empty. No runs 
have been created for this workflow
 TITLE
 Marked On
-Created :
+Created: %1$s
 Modified :
 Workflow Description
 Workflow Detail

incubator-taverna-mobile git commit: More placeholders for text. Full size workflow image.

[ianwdunlop]

Repository: incubator-taverna-mobile
Updated Branches:
  refs/heads/master 72af3752d -> e400d8c8d


More placeholders for text. Full size workflow image.


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/e400d8c8
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/e400d8c8
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/e400d8c8

Branch: refs/heads/master
Commit: e400d8c8d3800a3e7d8487733d069db090b785c1
Parents: 72af375
Author: Ian Dunlop 
Authored: Fri Apr 29 12:31:20 2016 +0100
Committer: Ian Dunlop 
Committed: Fri Apr 29 12:31:20 2016 +0100

--
 .../workflowdetails/WorkflowdetailFragment.java | 10 ++-
 .../res/layout/fragment_workflow_detail.xml | 81 +++-
 app/src/main/res/values/strings.xml |  2 +
 3 files changed, 51 insertions(+), 42 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/e400d8c8/app/src/main/java/org/apache/taverna/mobile/fragments/workflowdetails/WorkflowdetailFragment.java
--
diff --git 
a/app/src/main/java/org/apache/taverna/mobile/fragments/workflowdetails/WorkflowdetailFragment.java
 
b/app/src/main/java/org/apache/taverna/mobile/fragments/workflowdetails/WorkflowdetailFragment.java
index 0a98a8d..3600e10 100644
--- 
a/app/src/main/java/org/apache/taverna/mobile/fragments/workflowdetails/WorkflowdetailFragment.java
+++ 
b/app/src/main/java/org/apache/taverna/mobile/fragments/workflowdetails/WorkflowdetailFragment.java
@@ -333,20 +333,22 @@ public class WorkflowdetailFragment extends Fragment 
implements View.OnClickList
 //load necessary widgets
 
 //set widget data
+//Use android resources to insert text into placeholder
+Resources resources = cont.getResources();
 User uploader = wk.getUploader();
-author.setText("Uploader:" + uploader != 
null?uploader.getName():"Unknown");
+String uploaderText = 
String.format(resources.getString(R.string.workflow_author), uploader != null ? 
uploader.getName():"Unknown");
+author.setText(uploaderText);
 title.setText(wk.getWorkflow_title());
 if (wk.getWorkflow_description() != null) {
 desc.setText(wk.getWorkflow_description());
 } else {
 //desc.setVisibility(View.INVISIBLE); //Not sure I trust 
this! Needs investigating.
 }
-//Use android resources to insert text into placeholder
-Resources resources = cont.getResources();
 String createdAtText = 
String.format(resources.getString(R.string.created), 
wk.getWorkflow_datecreated());
 createdat.setText(createdAtText);
 //updated.setText("Workflow Description");
-type.setText("Type: "+wk.getWorkflow_Type());
+String typeText = 
String.format(resources.getString(R.string.workflow_type_text), 
wk.getWorkflow_Type());
+type.setText(typeText);
 
   //preview.setImageURI(Uri.parse(wk.getWorkflow_preview()));
 new LoadImageThread(preview, 
wk.getWorkflow_preview()).execute();

http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/e400d8c8/app/src/main/res/layout/fragment_workflow_detail.xml
--
diff --git a/app/src/main/res/layout/fragment_workflow_detail.xml 
b/app/src/main/res/layout/fragment_workflow_detail.xml
index 6886d7a..93ab05c 100644
--- a/app/src/main/res/layout/fragment_workflow_detail.xml
+++ b/app/src/main/res/layout/fragment_workflow_detail.xml
@@ -26,14 +26,6 @@ limitations under the License.
 android:padding="5dp"
 android:background="@color/button_material_light">
 
-
-
 
 
+
+
 
+android:text="@string/created"
+android:phoneNumber="false" />
 

incubator-taverna-mobile git commit: Move the actual author name to its own text view

[ianwdunlop]

Repository: incubator-taverna-mobile
Updated Branches:
  refs/heads/master e400d8c8d -> 562d5ebf3


Move the actual author name to its own text view


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/562d5ebf
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/562d5ebf
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/562d5ebf

Branch: refs/heads/master
Commit: 562d5ebf3f8791c929ddadca6b9635af61ce8a08
Parents: e400d8c
Author: Ian Dunlop 
Authored: Wed May 4 11:28:37 2016 +0100
Committer: Ian Dunlop 
Committed: Wed May 4 11:28:37 2016 +0100

--
 .../workflowdetails/WorkflowdetailFragment.java |  6 ++--
 .../res/layout/fragment_workflow_detail.xml | 34 +++-
 app/src/main/res/values/strings.xml |  2 +-
 3 files changed, 30 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/562d5ebf/app/src/main/java/org/apache/taverna/mobile/fragments/workflowdetails/WorkflowdetailFragment.java
--
diff --git 
a/app/src/main/java/org/apache/taverna/mobile/fragments/workflowdetails/WorkflowdetailFragment.java
 
b/app/src/main/java/org/apache/taverna/mobile/fragments/workflowdetails/WorkflowdetailFragment.java
index 3600e10..0449dd7 100644
--- 
a/app/src/main/java/org/apache/taverna/mobile/fragments/workflowdetails/WorkflowdetailFragment.java
+++ 
b/app/src/main/java/org/apache/taverna/mobile/fragments/workflowdetails/WorkflowdetailFragment.java
@@ -319,7 +319,7 @@ public class WorkflowdetailFragment extends Fragment 
implements View.OnClickList
 
 public static void setWorkflowDetails(final Workflow wk){
 currentWorkflow = wk;
-final TextView author = (TextView) 
rootView.findViewById(R.id.wkf_author);
+final TextView author = (TextView) 
rootView.findViewById(R.id.wkf_author_text);
 //final TextView updated = (TextView) 
rootView.findViewById(R.id.wupdatedat);
 final TextView type = (TextView) rootView.findViewById(R.id.wtype);
 final TextView title = (TextView) rootView.findViewById(R.id.wtitle);
@@ -336,8 +336,8 @@ public class WorkflowdetailFragment extends Fragment 
implements View.OnClickList
 //Use android resources to insert text into placeholder
 Resources resources = cont.getResources();
 User uploader = wk.getUploader();
-String uploaderText = 
String.format(resources.getString(R.string.workflow_author), uploader != null ? 
uploader.getName():"Unknown");
-author.setText(uploaderText);
+//String uploaderText = 
String.format(resources.getString(R.string.workflow_author), uploader != null ? 
uploader.getName():"Unknown");
+author.setText((uploader != null) ? uploader.getName() : 
"Unknown");
 title.setText(wk.getWorkflow_title());
 if (wk.getWorkflow_description() != null) {
 desc.setText(wk.getWorkflow_description());

http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/562d5ebf/app/src/main/res/layout/fragment_workflow_detail.xml
--
diff --git a/app/src/main/res/layout/fragment_workflow_detail.xml 
b/app/src/main/res/layout/fragment_workflow_detail.xml
index 93ab05c..8016f44 100644
--- a/app/src/main/res/layout/fragment_workflow_detail.xml
+++ b/app/src/main/res/layout/fragment_workflow_detail.xml
@@ -44,16 +44,30 @@ limitations under the License.
 android:id="@+id/wtitle"
 android:layout_marginTop="5dp"
 android:hint="@string/detail_title_section1" />
+
 
-
+
 
+
+
 
 
+
+
+
+
 http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/562d5ebf/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 cfae829..c452d2f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -57,7 +57,7 @@ limitations under the License.
 TITLE
 Marked On
 Type: %1$s
-Uploaded by: %1$s
+Uploaded by:
 Created: %1$s
 Modified :
 Workflow Description

[1/2] incubator-taverna-commandline git commit: Update taverna-commandline README.md - Minor edits

[ianwdunlop]

Repository: incubator-taverna-commandline
Updated Branches:
  refs/heads/master e8d6a2e3f -> 78810e14c


Update taverna-commandline README.md - Minor edits

Broken links NOT FIXED:
http://taverna.incubator.apache.org/download/engine/
in lines 232 and 245
and
http://taverna.incubator.apache.org/download/common-activities/
in line 247

Project: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-commandline/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-commandline/commit/ec78aa2f
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-commandline/tree/ec78aa2f
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-commandline/diff/ec78aa2f

Branch: refs/heads/master
Commit: ec78aa2fb264ced00bb51bf6693a4bd560ed2bc5
Parents: e8d6a2e
Author: galejwnaylor 
Authored: Fri May 6 17:21:19 2016 -0700
Committer: galejwnaylor 
Committed: Fri May 6 17:21:19 2016 -0700

--
 README.md | 20 ++--
 1 file changed, 10 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-taverna-commandline/blob/ec78aa2f/README.md
--
diff --git a/README.md b/README.md
index dcb7f61..0adb5ae 100644
--- a/README.md
+++ b/README.md
@@ -20,7 +20,7 @@
 Launcher for running
 [Apache Taverna](http://taverna.incubator.apache.org/) workflows.
 
-Note that except for command line parsing, this module relies on other
+Note that, except for command line parsing, this module relies on other
 [Apache Taverna modules](http://taverna.incubator.apache.org/code) for
 the actual workflow execution.
 
@@ -38,7 +38,7 @@ Licensed under the
 [Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0),
 see the file [LICENSE](LICENSE) for details.
 
-The file [NOTICE](NOTICE) contain any additional attributions and
+The file [NOTICE](NOTICE) contains any additional attributions and
 details about embedded third-party libraries and source code.
 
 
@@ -49,7 +49,7 @@ Please subscribe to and contact the
 mailing list for any questions, suggestions and discussions about
 Apache Taverna.
 
-Bugs and feature plannings are tracked in the Jira
+Bugs and planned features are tracked in the Jira
 [issue 
tracker](https://issues.apache.org/jira/browse/TAVERNA/component/12326812)
 under the `TAVERNA` component _Taverna Commandline._ Feel free
 to [add an 
issue](https://taverna.incubator.apache.org/community/issue-tracker)!
@@ -58,7 +58,7 @@ To suggest changes to this source code, feel free to raise a
 [GitHub pull 
request](https://github.com/apache/incubator-taverna-commandline/pulls).
 
 Apache Taverna Command Line product relies on
-[other Taverna component](https://taverna.incubator.apache.org/code/)
+[other Taverna components](https://taverna.incubator.apache.org/code/)
 which have their own source code repositories.
 
 Any contributions received are assumed to be covered by the [Apache License
@@ -74,7 +74,7 @@ sponsored by the [Apache Incubator 
PMC](http://incubator.apache.org/).
 
 [Incubation](http://incubator.apache.org/incubation/Process_Description.html)
 is required of all newly accepted projects until a further review
-indicates that the infrastructure, communications, and decision making process
+indicates that the infrastructure, communications, and decision-making process
 have stabilized in a manner consistent with other successful ASF projects.
 
 While incubation status is not necessarily a reflection of the completeness
@@ -165,9 +165,9 @@ directory. Inside you should find a folder like
 `apache-taverna-commandline-3.1.0-incubating/`
 which contain the built Apache Taverna Command Line product.
 
-If you prefer a ZIP file, then build instead with
-the Maven option `-Prelease`. You can then unzip at a location of
-your own choice.
+If you prefer a ZIP file, then instead build with
+the Maven `-Prelease` option. You can then unzip at a location of
+your choice.
 
 If you are running on Windows you may need to
 put Taverna Command Line in a folder high in the
@@ -228,11 +228,11 @@ for both object code and source code.
 
 The following provides more details on the included cryptographic software:
 
-* Apache Taverna Command Line depend on and interact with the
+* Apache Taverna Command Line depends on and interacts with the
   [Apache Taverna 
Engine](http://taverna.incubator.apache.org/download/engine/),
   credential manager.
 * After building, the 
[taverna-commandline-product](taverna-commandline-product)
-  archive `lib` folder include
+  archive `lib` folder includes
   [BouncyCastle](https://www.bouncycastle.org/) bcprov encryption library,
   [Apache HttpComponents](https://hc.apache.org/) Core and Client,
   [Apache Derby](http://db.apache.org/derby/),

[2/2] incubator-taverna-commandline git commit: This closes #1

[ianwdunlop]

This closes #1


Project: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-commandline/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-commandline/commit/78810e14
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-commandline/tree/78810e14
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-commandline/diff/78810e14

Branch: refs/heads/master
Commit: 78810e14c739e1f14fed2e011386a9a85bfbe46f
Parents: e8d6a2e ec78aa2
Author: Ian Dunlop 
Authored: Thu May 12 11:30:06 2016 +0100
Committer: Ian Dunlop 
Committed: Thu May 12 11:30:06 2016 +0100

--
 README.md | 20 ++--
 1 file changed, 10 insertions(+), 10 deletions(-)
--

incubator-taverna-commandline git commit: Update Command-line README typos and grammar

[ianwdunlop]

Repository: incubator-taverna-commandline
Updated Branches:
  refs/heads/master ff2260991 -> 5d371a797


Update Command-line README typos and grammar

Just a few minor changes to word order, adding "-", 
and fixing a typo.

Project: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-commandline/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-commandline/commit/5d371a79
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-commandline/tree/5d371a79
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-commandline/diff/5d371a79

Branch: refs/heads/master
Commit: 5d371a797b2f512f967879df13b65aba4317b6fb
Parents: ff22609
Author: galejwnaylor 
Authored: Fri Jul 1 07:33:04 2016 -0700
Committer: GitHub 
Committed: Fri Jul 1 07:33:04 2016 -0700

--
 README.md | 14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-taverna-commandline/blob/5d371a79/README.md
--
diff --git a/README.md b/README.md
index 77c8674..80ae73d 100644
--- a/README.md
+++ b/README.md
@@ -40,7 +40,7 @@ the Command-line supports plugins using
 [Taverna OSGi services](https://taverna.incubator.apache.org/download/osgi/).
 
 
-Note that, except for command line handling, this
+Note that, except for command-line handling, this
 module relies on other
 [Apache Taverna components](https://taverna.incubator.apache.org/code) for the 
actual workflow execution.
 
@@ -111,10 +111,10 @@ fully endorsed by the ASF.
 
 This code relies on other
 [Apache Taverna modules](https://taverna.incubator.apache.org/download/code/),
-which Maven shuold automatically
-download from
+which Maven should download 
+automatically from
 [Apache's Maven 
repository](https://taverna.incubator.apache.org/download/maven/);
-however you might want to compile these yourself in the below order:
+however you might want to compile these yourself in the order below:
 
 * [taverna-language](https://taverna.incubator.apache.org/download/language/)
 * [taverna-osgi](https://taverna.incubator.apache.org/download/osgi/)
@@ -130,7 +130,7 @@ To build, use
 
 mvn clean install
 
-This will build each module and run their tests.
+This will build each module and run its tests.
 
 Note that this repository relies on
 other [Apache Taverna modules](https://taverna.incubator.apache.org/code)
@@ -215,7 +215,7 @@ your choice.
 If you are running on Windows you may need to
 put Taverna Command-line Tool in a folder high in the
 disk hierarchy (e.g. `C:\Taverna`), this helps
-avoid problems with Windows path length restrictions.
+avoid problems with Windows path-length restrictions.
 
 
 Running `executeworkflow.sh` (or `executeworkflow.bat`) without arguments
@@ -235,7 +235,7 @@ usage: executeworkflow [options] [workflow]
 ...
 ```
 
-The folder `examples` contain a Hello World type example workflow in
+The folder `examples` contains a Hello World type example workflow in
 [SCUFL2 format](http://taverna.incubator.apache.org/documentation/scufl2/).
 
 ```

svn commit: r1751248 - /incubator/taverna/site/trunk/content/index.md

[ianwdunlop]

Author: ianwdunlop
Date: Mon Jul  4 11:28:55 2016
New Revision: 1751248

URL: http://svn.apache.org/viewvc?rev=1751248&view=rev
Log:
Add command line release alert message

Modified:
incubator/taverna/site/trunk/content/index.md

Modified: incubator/taverna/site/trunk/content/index.md
URL: 
http://svn.apache.org/viewvc/incubator/taverna/site/trunk/content/index.md?rev=1751248&r1=1751247&r2=1751248&view=diff
==
--- incubator/taverna/site/trunk/content/index.md (original)
+++ incubator/taverna/site/trunk/content/index.md Mon Jul  4 11:28:55 2016
@@ -43,6 +43,12 @@ You might still find links to the earlie
 website which is not affiliated with Apache and provided for archive purposes 
only.
 
 
+
+
+
+Apache Taverna Command Line https://taverna.incubator.apache.org/download/commandline/";>3.1.0 has 
now been released.
+
+
 
 
 

svn commit: r992017 - in /websites/production/taverna: cgi-bin/ content/

[ianwdunlop]

Author: ianwdunlop
Date: Mon Jul  4 11:31:16 2016
New Revision: 992017

Log:
Alert with command line 3.1.0 release mentioned

Added:
websites/production/taverna/cgi-bin/
  - copied from r992016, websites/staging/taverna/trunk/cgi-bin/
websites/production/taverna/content/
  - copied from r992016, websites/staging/taverna/trunk/content/

[10/50] incubator-taverna-mobile git commit: add user detail function in data manager

[ianwdunlop]

add user detail function in data manager


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/a85f69d2
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/a85f69d2
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/a85f69d2

Branch: refs/heads/master
Commit: a85f69d23ca19da8f2f71423481347681779a647
Parents: 2bebdb5
Author: Sagar 
Authored: Fri Jul 1 12:16:47 2016 +0530
Committer: Sagar 
Committed: Fri Jul 1 12:16:47 2016 +0530

--
 .../java/org/apache/taverna/mobile/data/DataManager.java| 9 +
 1 file changed, 9 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/a85f69d2/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 97421e1..9fc5452 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
@@ -21,6 +21,7 @@ package org.apache.taverna.mobile.data;
 import org.apache.taverna.mobile.data.model.Announcements;
 import org.apache.taverna.mobile.data.model.DetailAnnouncement;
 import org.apache.taverna.mobile.data.model.DetailWorkflow;
+import org.apache.taverna.mobile.data.model.User;
 import org.apache.taverna.mobile.data.model.Workflows;
 import org.apache.taverna.mobile.data.remote.BaseApiManager;
 
@@ -65,4 +66,12 @@ public class DataManager {
 return mBaseApiManager.getTavernaApi().getDetailWorkflow(id, options);
 }
 
+/**
+ * @return Detail of  User
+ */
+
+public Observable getUserDetail(String id, Map 
options) {
+return mBaseApiManager.getTavernaApi().getUserDetail(id, options);
+}
+
 }
\ No newline at end of file

[15/50] incubator-taverna-mobile git commit: add no internet string

[ianwdunlop]

add no internet string


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/9bf1d484
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/9bf1d484
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/9bf1d484

Branch: refs/heads/master
Commit: 9bf1d48425fc58a243ac3eb66a6630bc07be1568
Parents: fae70dc
Author: Sagar 
Authored: Fri Jul 1 17:10:46 2016 +0530
Committer: Sagar 
Committed: Fri Jul 1 17:10:46 2016 +0530

--
 app/src/main/res/values/strings.xml | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/9bf1d484/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 9633b0a..8a0092e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -110,4 +110,5 @@ limitations under the License.
 Workflow Run ID:
 
 Announcementss
+No Internet Connection
 

[05/50] incubator-taverna-mobile git commit: add workflow detail activity to manifest

[ianwdunlop]

add workflow detail activity to manifest


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/49aa97bc
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/49aa97bc
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/49aa97bc

Branch: refs/heads/master
Commit: 49aa97bc6bda7c11faca5815295dcab985a7c648
Parents: 4477d1d
Author: Sagar 
Authored: Fri Jul 1 10:55:36 2016 +0530
Committer: Sagar 
Committed: Fri Jul 1 10:55:36 2016 +0530

--
 app/src/main/AndroidManifest.xml | 8 
 1 file changed, 8 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/49aa97bc/app/src/main/AndroidManifest.xml
--
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 9590e79..b2e0872 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -101,6 +101,14 @@ limitations under the License.
 
 
 
+
+
+
 
 
 

[16/50] incubator-taverna-mobile git commit: remove progressbar visibility on error

[ianwdunlop]

remove progressbar visibility on error


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/e5c94bd6
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/e5c94bd6
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/e5c94bd6

Branch: refs/heads/master
Commit: e5c94bd6554fe74162e2ed1adbd5352c14d33d28
Parents: 9bf1d48
Author: Sagar 
Authored: Fri Jul 1 17:12:55 2016 +0530
Committer: Sagar 
Committed: Fri Jul 1 17:12:55 2016 +0530

--
 .../taverna/mobile/ui/workflowdetail/WorkflowDetailFragment.java| 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/e5c94bd6/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 c526a46..10397db 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
@@ -115,6 +115,7 @@ public class WorkflowDetailFragment extends Fragment 
implements WorkflowDetailMv
 mWorkflowDetailPresenter.loadWorkflowDetail(id);
 }else {
 
+mProgressBar.setVisibility(View.GONE);
 showErrorSnackBar(getString(R.string.no_internet));
 }
 }

[03/50] incubator-taverna-mobile git commit: add detail workflow activity layout

[ianwdunlop]

add detail workflow activity layout


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/a20bf0b0
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/a20bf0b0
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/a20bf0b0

Branch: refs/heads/master
Commit: a20bf0b0072ac970e72abcdcf0d34b0591019fc5
Parents: 074b9da
Author: Sagar 
Authored: Fri Jul 1 10:54:27 2016 +0530
Committer: Sagar 
Committed: Fri Jul 1 10:54:27 2016 +0530

--
 app/src/main/res/layout/activity_detail_workflow.xml | 14 ++
 1 file changed, 14 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/a20bf0b0/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
new file mode 100644
index 000..39588ae
--- /dev/null
+++ b/app/src/main/res/layout/activity_detail_workflow.xml
@@ -0,0 +1,14 @@
+
+http://schemas.android.com/apk/res/android";
+android:layout_width="match_parent"
+android:layout_height="match_parent"
+android:orientation="vertical">
+
+
+
+
\ No newline at end of file

[40/50] incubator-taverna-mobile git commit: add favourite var in bean

[ianwdunlop]

add favourite var in bean


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/d21d49df
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/d21d49df
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/d21d49df

Branch: refs/heads/master
Commit: d21d49df354741ced22979c3082bfaf3bc394275
Parents: 526e74d
Author: Sagar 
Authored: Mon Jul 4 18:16:51 2016 +0530
Committer: Sagar 
Committed: Mon Jul 4 18:16:51 2016 +0530

--
 .../org/apache/taverna/mobile/data/model/Workflow.java | 13 +
 1 file changed, 13 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/d21d49df/app/src/main/java/org/apache/taverna/mobile/data/model/Workflow.java
--
diff --git 
a/app/src/main/java/org/apache/taverna/mobile/data/model/Workflow.java 
b/app/src/main/java/org/apache/taverna/mobile/data/model/Workflow.java
index d41b7ed..42dfd87 100644
--- a/app/src/main/java/org/apache/taverna/mobile/data/model/Workflow.java
+++ b/app/src/main/java/org/apache/taverna/mobile/data/model/Workflow.java
@@ -113,6 +113,9 @@ public class Workflow extends TavernaBaseModel implements 
Parcelable {
 @ElementList(name = "tags", required = false)
 List tag;
 
+@Column(defaultValue = "0")
+boolean favourite;
+
 public String getContentType() {
 return contentType;
 }
@@ -249,6 +252,14 @@ public class Workflow extends TavernaBaseModel implements 
Parcelable {
 this.updatedAt = updatedAt;
 }
 
+public boolean isFavourite() {
+return favourite;
+}
+
+public void setFavourite(boolean favourite) {
+this.favourite = favourite;
+}
+
 public Workflow() {
 }
 
@@ -276,6 +287,7 @@ public class Workflow extends TavernaBaseModel implements 
Parcelable {
 dest.writeString(this.contentUri);
 dest.writeString(this.contentType);
 dest.writeTypedList(this.tag);
+dest.writeByte(this.favourite ? (byte) 1 : (byte) 0);
 }
 
 protected Workflow(Parcel in) {
@@ -296,6 +308,7 @@ public class Workflow extends TavernaBaseModel implements 
Parcelable {
 this.contentUri = in.readString();
 this.contentType = in.readString();
 this.tag = in.createTypedArrayList(Tag.CREATOR);
+this.favourite = in.readByte() != 0;
 }
 
 public static final Creator CREATOR = new Creator() {

[01/50] incubator-taverna-mobile git commit: add color

[ianwdunlop]

Repository: incubator-taverna-mobile
Updated Branches:
  refs/heads/master 4daa91d3f -> fb8e0981b


add color


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/ef54c293
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/ef54c293
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/ef54c293

Branch: refs/heads/master
Commit: ef54c293554886568784c46aaff7336af52b18ab
Parents: 64fa262
Author: Sagar 
Authored: Fri Jul 1 10:53:24 2016 +0530
Committer: Sagar 
Committed: Fri Jul 1 10:53:24 2016 +0530

--
 app/src/main/res/values/colors.xml | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/ef54c293/app/src/main/res/values/colors.xml
--
diff --git a/app/src/main/res/values/colors.xml 
b/app/src/main/res/values/colors.xml
index 5ad7657..93f5b10 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -22,4 +22,5 @@
#FFF5F5F5
#e0e0e0
#882196F3
+   #e0e0e0
 
\ No newline at end of file

[17/50] incubator-taverna-mobile git commit: remove checkstyle error

[ianwdunlop]

remove checkstyle error


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/b42bacd6
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/b42bacd6
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/b42bacd6

Branch: refs/heads/master
Commit: b42bacd6ad2ff7b0a52d96b2b72bfc0862695062
Parents: e5c94bd
Author: Sagar 
Authored: Fri Jul 1 17:15:16 2016 +0530
Committer: Sagar 
Committed: Fri Jul 1 17:15:16 2016 +0530

--
 .../mobile/ui/workflow/WorkflowFragment.java|  2 +-
 .../workflowdetail/WorkflowDetailActivity.java  |  2 +-
 .../workflowdetail/WorkflowDetailFragment.java  | 22 ++--
 3 files changed, 13 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/b42bacd6/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 370e983..be433d7 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,7 +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());
+intent.putExtra("title", mWorkflowList.get(position).getTitle());
 startActivity(intent);
 }
 

http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/b42bacd6/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 ed765c6..2ac4f47 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
@@ -28,7 +28,7 @@ public class WorkflowDetailActivity extends AppCompatActivity 
{
 
 ActionBar actionbar = getSupportActionBar();
 
-if(actionbar!=null){
+if (actionbar != null) {
 actionbar.setHomeButtonEnabled(true);
 actionbar.setDisplayHomeAsUpEnabled(true);
 actionbar.setTitle(getIntent().getStringExtra("title"));

http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/b42bacd6/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 10397db..35f88cf 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
@@ -110,10 +110,10 @@ public class WorkflowDetailFragment extends Fragment 
implements WorkflowDetailMv
 public void onActivityCreated(@Nullable Bundle savedInstanceState) {
 super.onActivityCreated(savedInstanceState);
 
-if(mConnectionInfo.isConnectingToInternet()) {
+if (mConnectionInfo.isConnectingToInternet()) {
 
 mWorkflowDetailPresenter.loadWorkflowDetail(id);
-}else {
+} else {
 
 mProgressBar.setVisibility(View.GONE);
 showErrorSnackBar(getString(R.string.no_internet));
@@ -162,16 +162,16 @@ public class WorkflowDetailFragment extends Fragment 
implements WorkflowDetailMv
 @Override
 public void showErrorSnackBar(String error) {
 
-final Snackbar snackbar = Snackbar.make(rootLayout, error, Snackbar
-.LENGTH_INDEFINITE);
-snackbar.setAction("OK", new View.OnClickListener() {
-@Override
-public void onClick(View view) {
-snackbar.dismiss();
-}
-});
+final Snackbar snackbar = Snackbar.make(rootLayout, error, Snackbar
+.LENGTH_INDEFINITE);
+snackbar.setAction("OK", new View

[11/50] incubator-taverna-mobile git commit: add uploader image logic

[ianwdunlop]

add uploader image logic


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/8ed4cb81
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/8ed4cb81
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/8ed4cb81

Branch: refs/heads/master
Commit: 8ed4cb81ae5559ecf6bd2feea1db5f6f2fa9bee9
Parents: a85f69d
Author: Sagar 
Authored: Fri Jul 1 15:55:08 2016 +0530
Committer: Sagar 
Committed: Fri Jul 1 15:55:08 2016 +0530

--
 .../workflowdetail/WorkflowDetailFragment.java  | 13 +++
 .../workflowdetail/WorkflowDetailMvpView.java   |  3 ++
 .../workflowdetail/WorkflowDetailPresenter.java | 39 +++-
 3 files changed, 53 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/8ed4cb81/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 bcfdee8..21230b6 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
@@ -7,6 +7,7 @@ import com.bumptech.glide.load.engine.DiskCacheStrategy;
 import org.apache.taverna.mobile.R;
 import org.apache.taverna.mobile.data.DataManager;
 import org.apache.taverna.mobile.data.model.DetailWorkflow;
+import org.apache.taverna.mobile.data.model.User;
 import org.apache.taverna.mobile.utils.ConnectionInfo;
 
 import android.os.Bundle;
@@ -115,6 +116,18 @@ public class WorkflowDetailFragment extends Fragment 
implements WorkflowDetailMv
 }
 
 @Override
+public void setImage(User user) {
+
+Glide.with(getContext())
+.load(user.getAvatar().getResource())
+.diskCacheStrategy(DiskCacheStrategy.SOURCE)
+.placeholder(R.drawable.placeholder)
+.error(R.drawable.placeholder)
+.into(uploaderImage);
+
+}
+
+@Override
 public void onDestroyView() {
 super.onDestroyView();
 mWorkflowDetailPresenter.detachView();

http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/8ed4cb81/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailMvpView.java
--
diff --git 
a/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailMvpView.java
 
b/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailMvpView.java
index c4da38f..ed75e67 100644
--- 
a/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailMvpView.java
+++ 
b/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailMvpView.java
@@ -2,6 +2,7 @@ package org.apache.taverna.mobile.ui.workflowdetail;
 
 
 import org.apache.taverna.mobile.data.model.DetailWorkflow;
+import org.apache.taverna.mobile.data.model.User;
 import org.apache.taverna.mobile.ui.base.MvpView;
 
 public interface WorkflowDetailMvpView extends MvpView {
@@ -9,4 +10,6 @@ public interface WorkflowDetailMvpView extends MvpView {
 void showProgressbar(boolean b);
 
 void showWorkflowDetail(DetailWorkflow detailWorkflow);
+
+void setImage(User user);
 }

http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/8ed4cb81/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailPresenter.java
--
diff --git 
a/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailPresenter.java
 
b/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailPresenter.java
index 8c6c2bf..660d75f 100644
--- 
a/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailPresenter.java
+++ 
b/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailPresenter.java
@@ -2,6 +2,7 @@ package org.apache.taverna.mobile.ui.workflowdetail;
 
 import org.apache.taverna.mobile.data.DataManager;
 import org.apache.taverna.mobile.data.model.DetailWorkflow;
+import org.apache.taverna.mobile.data.model.User;
 import org.apache.taverna.mobile.ui.base.BasePresenter;
 
 import java.util.HashMap;
@@ -37,7 +38,7 @@ public class WorkflowDetailPresenter extends 
BasePresenter() {
@@ -54,16 +55,50 @@ public class WorkflowDetailPresenter extends 
BasePresenter getQueryOptions() {
+private void loadUserDetail(String id) {
+
+getMvpView().showProgressb

[20/50] incubator-taverna-mobile git commit: add licence in taverna service

[ianwdunlop]

add licence in taverna service


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/8d5f5136
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/8d5f5136
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/8d5f5136

Branch: refs/heads/master
Commit: 8d5f51361a91c35ec32049fb27f0a74fb8561ed9
Parents: 61c3b0e
Author: Sagar 
Authored: Fri Jul 1 23:52:00 2016 +0530
Committer: Sagar 
Committed: Fri Jul 1 23:52:00 2016 +0530

--
 .../org/apache/taverna/mobile/data/remote/APIEndPoint.java | 1 +
 .../org/apache/taverna/mobile/data/remote/TavernaService.java  | 6 ++
 2 files changed, 7 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/8d5f5136/app/src/main/java/org/apache/taverna/mobile/data/remote/APIEndPoint.java
--
diff --git 
a/app/src/main/java/org/apache/taverna/mobile/data/remote/APIEndPoint.java 
b/app/src/main/java/org/apache/taverna/mobile/data/remote/APIEndPoint.java
index 5ce11fe..9960aa9 100644
--- a/app/src/main/java/org/apache/taverna/mobile/data/remote/APIEndPoint.java
+++ b/app/src/main/java/org/apache/taverna/mobile/data/remote/APIEndPoint.java
@@ -27,5 +27,6 @@ public class APIEndPoint {
 public static final String ALL_WORKFLOW = "workflows.xml";
 public static final String WORKFLOW = "workflow.xml";
 public static final String USER = "user.xml";
+public static final String LICENCE = "licence.xml";
 
 }

http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/8d5f5136/app/src/main/java/org/apache/taverna/mobile/data/remote/TavernaService.java
--
diff --git 
a/app/src/main/java/org/apache/taverna/mobile/data/remote/TavernaService.java 
b/app/src/main/java/org/apache/taverna/mobile/data/remote/TavernaService.java
index 02bacef..f3a7e4a 100644
--- 
a/app/src/main/java/org/apache/taverna/mobile/data/remote/TavernaService.java
+++ 
b/app/src/main/java/org/apache/taverna/mobile/data/remote/TavernaService.java
@@ -21,6 +21,7 @@ package org.apache.taverna.mobile.data.remote;
 import org.apache.taverna.mobile.data.model.Announcements;
 import org.apache.taverna.mobile.data.model.DetailAnnouncement;
 import org.apache.taverna.mobile.data.model.DetailWorkflow;
+import org.apache.taverna.mobile.data.model.License;
 import org.apache.taverna.mobile.data.model.User;
 import org.apache.taverna.mobile.data.model.Workflows;
 
@@ -50,4 +51,9 @@ public interface TavernaService {
 @GET(APIEndPoint.USER)
 Observable getUserDetail(@Query("id") String id
 , @QueryMap Map options);
+
+@GET(APIEndPoint.LICENCE)
+Observable getLicenceDetail(@Query("id") String id
+, @QueryMap Map options);
+
 }
\ No newline at end of file

[32/50] incubator-taverna-mobile git commit: add stetho library

[ianwdunlop]

add stetho library


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/49d15441
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/49d15441
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/49d15441

Branch: refs/heads/master
Commit: 49d1544129b918957bd2c97357bed326851cfd00
Parents: bd59537
Author: Sagar 
Authored: Sun Jul 3 13:40:41 2016 +0530
Committer: Sagar 
Committed: Sun Jul 3 13:40:41 2016 +0530

--
 app/build.gradle | 3 +++
 1 file changed, 3 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/49d15441/app/build.gradle
--
diff --git a/app/build.gradle b/app/build.gradle
index 645e757..ccdadf9 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -69,4 +69,7 @@ dependencies {
 apt "com.github.Raizlabs.DBFlow:dbflow-processor:3.0.1"
 compile "com.github.Raizlabs.DBFlow:dbflow-core:3.0.1"
 compile "com.github.Raizlabs.DBFlow:dbflow:3.0.1"
+
+compile 'com.facebook.stetho:stetho:1.3.1'
+compile 'com.facebook.stetho:stetho-okhttp3:1.3.1'
 }

[12/50] incubator-taverna-mobile git commit: remove checkstyle error

[ianwdunlop]

remove checkstyle error


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/3c016457
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/3c016457
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/3c016457

Branch: refs/heads/master
Commit: 3c016457557934791bd8fa827a90902f9660b2f8
Parents: 8ed4cb8
Author: Sagar 
Authored: Fri Jul 1 15:58:10 2016 +0530
Committer: Sagar 
Committed: Fri Jul 1 15:58:10 2016 +0530

--
 app/src/main/java/org/apache/taverna/mobile/data/model/User.java | 4 ++--
 .../java/org/apache/taverna/mobile/data/remote/APIEndPoint.java  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/3c016457/app/src/main/java/org/apache/taverna/mobile/data/model/User.java
--
diff --git a/app/src/main/java/org/apache/taverna/mobile/data/model/User.java 
b/app/src/main/java/org/apache/taverna/mobile/data/model/User.java
index f04aa93..36b3110 100644
--- a/app/src/main/java/org/apache/taverna/mobile/data/model/User.java
+++ b/app/src/main/java/org/apache/taverna/mobile/data/model/User.java
@@ -7,7 +7,7 @@ import org.simpleframework.xml.Root;
 import android.os.Parcel;
 import android.os.Parcelable;
 
-@Root(name="user")
+@Root(name = "user")
 public class User implements Parcelable {
 
 @Attribute(name = "resource", required = false)
@@ -43,7 +43,7 @@ public class User implements Parcelable {
 @Element(name = "website", required = false)
 private String website;
 
-@Element(name = "avatar",required = false)
+@Element(name = "avatar", required = false)
 private Avatar avatar;
 
 public String getResource() {

http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/3c016457/app/src/main/java/org/apache/taverna/mobile/data/remote/APIEndPoint.java
--
diff --git 
a/app/src/main/java/org/apache/taverna/mobile/data/remote/APIEndPoint.java 
b/app/src/main/java/org/apache/taverna/mobile/data/remote/APIEndPoint.java
index fbaef25..5ce11fe 100644
--- a/app/src/main/java/org/apache/taverna/mobile/data/remote/APIEndPoint.java
+++ b/app/src/main/java/org/apache/taverna/mobile/data/remote/APIEndPoint.java
@@ -26,6 +26,6 @@ public class APIEndPoint {
 public static final String ANNOUNCEMENT = "announcement.xml";
 public static final String ALL_WORKFLOW = "workflows.xml";
 public static final String WORKFLOW = "workflow.xml";
-public static final String USER="user.xml";
+public static final String USER = "user.xml";
 
 }

[02/50] incubator-taverna-mobile git commit: add workflow detail fragment

[ianwdunlop]

add workflow detail fragment


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/074b9da2
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/074b9da2
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/074b9da2

Branch: refs/heads/master
Commit: 074b9da266ea84dd07a3556f047153ee0d81587d
Parents: ef54c29
Author: Sagar 
Authored: Fri Jul 1 10:53:57 2016 +0530
Committer: Sagar 
Committed: Fri Jul 1 10:53:57 2016 +0530

--
 .../workflowdetail/WorkflowDetailFragment.java  | 122 +++
 1 file changed, 122 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/074b9da2/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
new file mode 100644
index 000..671a14d
--- /dev/null
+++ 
b/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailFragment.java
@@ -0,0 +1,122 @@
+package org.apache.taverna.mobile.ui.workflowdetail;
+
+
+import com.bumptech.glide.Glide;
+import com.bumptech.glide.load.engine.DiskCacheStrategy;
+
+import org.apache.taverna.mobile.R;
+import org.apache.taverna.mobile.data.DataManager;
+import org.apache.taverna.mobile.data.model.DetailWorkflow;
+import org.apache.taverna.mobile.utils.ConnectionInfo;
+
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.webkit.WebView;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+
+public class WorkflowDetailFragment extends Fragment implements 
WorkflowDetailMvpView {
+
+public final String LOG_TAG = getClass().getSimpleName();
+
+@BindView(R.id.ivWorkflowImage)
+ImageView workflowImage;
+
+@BindView(R.id.tvTitle)
+TextView title;
+
+@BindView(R.id.ivUploader)
+ImageView uploaderImage;
+
+@BindView(R.id.tvUploaderName)
+TextView uploaderName;
+
+@BindView(R.id.tvDate)
+TextView date;
+
+@BindView(R.id.tvType)
+TextView type;
+
+@BindView(R.id.tvDescription)
+WebView description;
+
+private DataManager dataManager;
+
+private WorkflowDetailPresenter mWorkflowDetailPresenter;
+
+private ConnectionInfo mConnectionInfo;
+
+private static final String ID="id";
+
+private String id;
+
+public static WorkflowDetailFragment newInstance(String id) {
+
+Bundle args = new Bundle();
+
+args.putString(ID,id);
+
+WorkflowDetailFragment fragment = new WorkflowDetailFragment();
+fragment.setArguments(args);
+return fragment;
+}
+
+@Override
+public void onCreate(Bundle savedInstanceState) {
+super.onCreate(savedInstanceState);
+
+id=getArguments().getString(ID);
+
+dataManager = new DataManager();
+mWorkflowDetailPresenter = new WorkflowDetailPresenter(dataManager);
+mConnectionInfo = new ConnectionInfo(getContext());
+}
+
+@Override
+public View onCreateView(LayoutInflater inflater, ViewGroup container, 
Bundle
+savedInstanceState) {
+
+View rootView = inflater.inflate(R.layout.fragment_detail_workflow, 
container, false);
+
+ButterKnife.bind(this, rootView);
+
+mWorkflowDetailPresenter.attachView(this);
+mWorkflowDetailPresenter.loadWorkflowDetail(id);
+
+return rootView;
+}
+
+@Override
+public void showProgressbar(boolean b) {
+
+}
+
+@Override
+public void showWorkflowDetail(DetailWorkflow detailWorkflow) {
+
+uploaderName.setText(detailWorkflow.getUploader().getContent());
+date.setText(detailWorkflow.getUpdatedAt());
+type.setText(detailWorkflow.getType().getContent());
+title.setText(detailWorkflow.getTitle());
+description.loadData(detailWorkflow.getDescription(), "text/html", 
"utf-8");
+
+Glide.with(getContext())
+.load(detailWorkflow.getPreviewUri())
+.diskCacheStrategy(DiskCacheStrategy.SOURCE)
+.placeholder(R.drawable.placeholder)
+.error(R.drawable.placeholder)
+.into(workflowImage);
+}
+
+@Override
+public void onDestroyView() {
+super.onDestroyView();
+mWorkflowDetailPresenter.detachView();
+}
+}

[04/50] incubator-taverna-mobile git commit: add workflow detail activity

[ianwdunlop]

add workflow detail activity


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/4477d1dd
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/4477d1dd
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/4477d1dd

Branch: refs/heads/master
Commit: 4477d1dd420377e9ad1ab1963e63e4c1e0b8fb3d
Parents: a20bf0b
Author: Sagar 
Authored: Fri Jul 1 10:54:56 2016 +0530
Committer: Sagar 
Committed: Fri Jul 1 10:54:56 2016 +0530

--
 .../workflowdetail/WorkflowDetailActivity.java  | 24 
 1 file changed, 24 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/4477d1dd/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
new file mode 100644
index 000..0229ec4
--- /dev/null
+++ 
b/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailActivity.java
@@ -0,0 +1,24 @@
+package org.apache.taverna.mobile.ui.workflowdetail;
+
+
+import org.apache.taverna.mobile.R;
+
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v7.app.AppCompatActivity;
+
+public class WorkflowDetailActivity extends AppCompatActivity {
+
+@Override
+protected void onCreate(@Nullable Bundle savedInstanceState) {
+super.onCreate(savedInstanceState);
+setContentView(R.layout.activity_detail_workflow);
+
+if (savedInstanceState == null) {
+getSupportFragmentManager().beginTransaction()
+.add(R.id.frame_container, 
WorkflowDetailFragment.newInstance(getIntent().getStringExtra("id")))
+.commit();
+}
+
+}
+}

[07/50] incubator-taverna-mobile git commit: remove checkstyle error

[ianwdunlop]

remove checkstyle error


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/a4b1fdfe
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/a4b1fdfe
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/a4b1fdfe

Branch: refs/heads/master
Commit: a4b1fdfe2edd966d1ff1bfa77cc418ef15cf7672
Parents: fc47ec3
Author: Sagar 
Authored: Fri Jul 1 11:46:23 2016 +0530
Committer: Sagar 
Committed: Fri Jul 1 11:46:23 2016 +0530

--
 .../main/java/org/apache/taverna/mobile/data/DataManager.java | 4 ++--
 .../org/apache/taverna/mobile/data/model/DetailWorkflow.java  | 2 +-
 .../apache/taverna/mobile/ui/workflow/WorkflowFragment.java   | 7 ---
 .../mobile/ui/workflowdetail/WorkflowDetailActivity.java  | 3 ++-
 .../mobile/ui/workflowdetail/WorkflowDetailFragment.java  | 6 +++---
 .../mobile/ui/workflowdetail/WorkflowDetailPresenter.java | 3 ++-
 6 files changed, 14 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/a4b1fdfe/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 cae4288..97421e1 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
@@ -61,8 +61,8 @@ public class DataManager {
  * @return Detail of  Workflow
  */
 
-public Observable getDetailWorkflow(String id,Map options) {
-return mBaseApiManager.getTavernaApi().getDetailWorkflow(id,options);
+public Observable getDetailWorkflow(String id, Map options) {
+return mBaseApiManager.getTavernaApi().getDetailWorkflow(id, options);
 }
 
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/a4b1fdfe/app/src/main/java/org/apache/taverna/mobile/data/model/DetailWorkflow.java
--
diff --git 
a/app/src/main/java/org/apache/taverna/mobile/data/model/DetailWorkflow.java 
b/app/src/main/java/org/apache/taverna/mobile/data/model/DetailWorkflow.java
index ed4c972..b4e072f 100644
--- a/app/src/main/java/org/apache/taverna/mobile/data/model/DetailWorkflow.java
+++ b/app/src/main/java/org/apache/taverna/mobile/data/model/DetailWorkflow.java
@@ -62,7 +62,7 @@ public class DetailWorkflow implements Parcelable {
 @Element(name = "created-at", required = false)
 private String createdAt;
 
-@Element(name="updated-at", required = false)
+@Element(name = "updated-at", required = false)
 private String updatedAt;
 
 @Element(name = "preview", required = false)

http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/a4b1fdfe/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 4d5f77f..8365cf5 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
@@ -47,7 +47,8 @@ import java.util.List;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 
-public class WorkflowFragment extends Fragment implements WorkflowMvpView, 
RecyclerItemClickListner.OnItemClickListener {
+public class WorkflowFragment extends Fragment implements WorkflowMvpView,
+RecyclerItemClickListner.OnItemClickListener {
 public final String LOG_TAG = getClass().getSimpleName();
 
 @BindView(R.id.rvDashboard)
@@ -158,8 +159,8 @@ public class WorkflowFragment extends Fragment implements 
WorkflowMvpView, Recyc
 
 @Override
 public void onItemClick(View childView, int position) {
-Intent intent=new Intent(getActivity() , WorkflowDetailActivity.class);
-intent.putExtra("id",mWorkflowList.get(position).getId());
+Intent intent = new Intent(getActivity(), 
WorkflowDetailActivity.class);
+intent.putExtra("id", mWorkflowList.get(position).getId());
 startActivity(intent);
 }
 

http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/a4b1fdfe/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/WorkflowDeta

[18/50] incubator-taverna-mobile git commit: add overflow menu

[ianwdunlop]

add overflow menu


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/2b416fe6
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/2b416fe6
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/2b416fe6

Branch: refs/heads/master
Commit: 2b416fe68956cae1b6b6a572dfc374d9c9accb4e
Parents: b42bacd
Author: Sagar 
Authored: Fri Jul 1 23:39:39 2016 +0530
Committer: Sagar 
Committed: Fri Jul 1 23:39:39 2016 +0530

--
 .../workflowdetail/WorkflowDetailFragment.java  | 24 
 app/src/main/res/menu/menu_workflow_detail.xml  | 12 ++
 app/src/main/res/values/strings.xml |  1 +
 3 files changed, 32 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/2b416fe6/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 35f88cf..22b96ea 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
@@ -15,6 +15,9 @@ import android.support.annotation.Nullable;
 import android.support.design.widget.Snackbar;
 import android.support.v4.app.Fragment;
 import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.webkit.WebView;
@@ -118,6 +121,27 @@ public class WorkflowDetailFragment extends Fragment 
implements WorkflowDetailMv
 mProgressBar.setVisibility(View.GONE);
 showErrorSnackBar(getString(R.string.no_internet));
 }
+
+setHasOptionsMenu(true);
+
+}
+
+@Override
+public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+super.onCreateOptionsMenu(menu, inflater);
+inflater.inflate(R.menu.menu_workflow_detail, menu);
+}
+
+@Override
+public boolean onOptionsItemSelected(MenuItem item) {
+switch (item.getItemId()){
+case R.id.licence:
+
+return true;
+}
+
+return super.onOptionsItemSelected(item);
+
 }
 
 @Override

http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/2b416fe6/app/src/main/res/menu/menu_workflow_detail.xml
--
diff --git a/app/src/main/res/menu/menu_workflow_detail.xml 
b/app/src/main/res/menu/menu_workflow_detail.xml
index ac1714e..7352b2a 100644
--- a/app/src/main/res/menu/menu_workflow_detail.xml
+++ b/app/src/main/res/menu/menu_workflow_detail.xml
@@ -1,7 +1,9 @@
 http://schemas.android.com/apk/res/android";
-xmlns:app="http://schemas.android.com/apk/res-auto";
-xmlns:tools="http://schemas.android.com/tools";
-
tools:context="org.apache.taverna.mobile.activities.WorkflowDetailActivity">
-
+  xmlns:app="http://schemas.android.com/apk/res-auto";
+  >
+
 

http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/2b416fe6/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 8a0092e..a13b6f9 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -111,4 +111,5 @@ limitations under the License.
 
 Announcementss
 No Internet Connection
+Licence
 

[48/50] incubator-taverna-mobile git commit: remove DBFlow warning

[ianwdunlop]

remove DBFlow warning


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/eaea8b73
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/eaea8b73
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/eaea8b73

Branch: refs/heads/master
Commit: eaea8b73900409d90546dfd721b4a67b5abb467a
Parents: 4a4980c
Author: Sagar 
Authored: Mon Jul 4 23:11:52 2016 +0530
Committer: Sagar 
Committed: Mon Jul 4 23:11:52 2016 +0530

--
 .../main/java/org/apache/taverna/mobile/data/model/Workflow.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/eaea8b73/app/src/main/java/org/apache/taverna/mobile/data/model/Workflow.java
--
diff --git 
a/app/src/main/java/org/apache/taverna/mobile/data/model/Workflow.java 
b/app/src/main/java/org/apache/taverna/mobile/data/model/Workflow.java
index 42dfd87..c545ee2 100644
--- a/app/src/main/java/org/apache/taverna/mobile/data/model/Workflow.java
+++ b/app/src/main/java/org/apache/taverna/mobile/data/model/Workflow.java
@@ -114,7 +114,7 @@ public class Workflow extends TavernaBaseModel implements 
Parcelable {
 List tag;
 
 @Column(defaultValue = "0")
-boolean favourite;
+Boolean favourite;
 
 public String getContentType() {
 return contentType;

[06/50] incubator-taverna-mobile git commit: add item click listener to get detail workflow

[ianwdunlop]

add item click listener to get detail workflow


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/fc47ec35
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/fc47ec35
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/fc47ec35

Branch: refs/heads/master
Commit: fc47ec358fa65c15859509c439d7f63782768480
Parents: 49aa97b
Author: Sagar 
Authored: Fri Jul 1 10:56:54 2016 +0530
Committer: Sagar 
Committed: Fri Jul 1 10:56:54 2016 +0530

--
 .../mobile/ui/workflow/WorkflowFragment.java| 20 +++-
 1 file changed, 19 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/fc47ec35/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 5d66f32..4d5f77f 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
@@ -24,9 +24,12 @@ import org.apache.taverna.mobile.data.DataManager;
 import org.apache.taverna.mobile.data.model.Workflow;
 import org.apache.taverna.mobile.data.model.Workflows;
 import org.apache.taverna.mobile.ui.adapter.EndlessRecyclerOnScrollListener;
+import org.apache.taverna.mobile.ui.adapter.RecyclerItemClickListner;
 import org.apache.taverna.mobile.ui.adapter.WorkflowAdapter;
+import org.apache.taverna.mobile.ui.workflowdetail.WorkflowDetailActivity;
 import org.apache.taverna.mobile.utils.ConnectionInfo;
 
+import android.content.Intent;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
 import android.support.v7.widget.DefaultItemAnimator;
@@ -44,7 +47,7 @@ import java.util.List;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 
-public class WorkflowFragment extends Fragment implements WorkflowMvpView {
+public class WorkflowFragment extends Fragment implements WorkflowMvpView, 
RecyclerItemClickListner.OnItemClickListener {
 public final String LOG_TAG = getClass().getSimpleName();
 
 @BindView(R.id.rvDashboard)
@@ -86,8 +89,11 @@ public class WorkflowFragment extends Fragment implements 
WorkflowMvpView {
 mRecyclerView.setLayoutManager(layoutManager);
 mRecyclerView.setItemAnimator(new DefaultItemAnimator());
 mRecyclerView.hasFixedSize();
+
 mWorkflowAdapter = new WorkflowAdapter(mWorkflowList, getContext());
+
 mRecyclerView.setAdapter(mWorkflowAdapter);
+mRecyclerView.addOnItemTouchListener(new 
RecyclerItemClickListner(getActivity(), this));
 
 mWorkflowPresenter.loadAllWorkflow(mPageNumber);
 
@@ -149,4 +155,16 @@ public class WorkflowFragment extends Fragment implements 
WorkflowMvpView {
 super.onDestroyView();
 mWorkflowPresenter.detachView();
 }
+
+@Override
+public void onItemClick(View childView, int position) {
+Intent intent=new Intent(getActivity() , WorkflowDetailActivity.class);
+intent.putExtra("id",mWorkflowList.get(position).getId());
+startActivity(intent);
+}
+
+@Override
+public void onItemLongPress(View childView, int position) {
+
+}
 }

[23/50] incubator-taverna-mobile git commit: add licence layout

[ianwdunlop]

add licence layout


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/0e59d8ec
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/0e59d8ec
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/0e59d8ec

Branch: refs/heads/master
Commit: 0e59d8ec5244a9be2e59600684db9ebb3eee0b2f
Parents: 59ba5d2
Author: Sagar 
Authored: Sat Jul 2 00:32:28 2016 +0530
Committer: Sagar 
Committed: Sat Jul 2 00:32:28 2016 +0530

--
 .../layout/dialog_licence_detail_workflow.xml   | 55 
 1 file changed, 55 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/0e59d8ec/app/src/main/res/layout/dialog_licence_detail_workflow.xml
--
diff --git a/app/src/main/res/layout/dialog_licence_detail_workflow.xml 
b/app/src/main/res/layout/dialog_licence_detail_workflow.xml
new file mode 100644
index 000..641e61d
--- /dev/null
+++ b/app/src/main/res/layout/dialog_licence_detail_workflow.xml
@@ -0,0 +1,55 @@
+
+http://schemas.android.com/apk/res/android";
+  android:layout_width="match_parent"
+  android:layout_height="match_parent"
+  android:orientation="vertical"
+  android:paddingBottom="8dp"
+  android:paddingLeft="24dp"
+  android:paddingRight="24dp"
+  android:paddingTop="24dp">
+
+
+
+
+
+
+
+
+
+
+
+

[37/50] incubator-taverna-mobile git commit: add DB layer to Data Layer

[ianwdunlop]

add DB layer to Data Layer


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/4d553b77
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/4d553b77
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/4d553b77

Branch: refs/heads/master
Commit: 4d553b77ffca08dc70d85fea0d2bd3ad604b823c
Parents: 80108f1
Author: Sagar 
Authored: Mon Jul 4 14:59:43 2016 +0530
Committer: Sagar 
Committed: Mon Jul 4 14:59:43 2016 +0530

--
 .../apache/taverna/mobile/data/DataManager.java | 20 ++--
 1 file changed, 18 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/4d553b77/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 e35cbb5..78c2e89 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
@@ -18,6 +18,7 @@
  */
 package org.apache.taverna.mobile.data;
 
+import org.apache.taverna.mobile.data.local.DBHelper;
 import org.apache.taverna.mobile.data.model.Announcements;
 import org.apache.taverna.mobile.data.model.DetailAnnouncement;
 import org.apache.taverna.mobile.data.model.Workflow;
@@ -29,12 +30,15 @@ import org.apache.taverna.mobile.data.remote.BaseApiManager;
 import java.util.Map;
 
 import rx.Observable;
+import rx.functions.Func1;
 
 
 public class DataManager {
 
 public BaseApiManager mBaseApiManager = new BaseApiManager();
 
+public DBHelper mDBHelper = new DBHelper();
+
 public DataManager() {
 }
 
@@ -56,7 +60,13 @@ public class DataManager {
  * @return List of all Workflow
  */
 public Observable getAllWorkflow(Map options) {
-return mBaseApiManager.getTavernaApi().getAllWorkflows(options);
+return mBaseApiManager.getTavernaApi().getAllWorkflows(options)
+.concatMap(new Func1>() {
+@Override
+public Observable call(Workflows 
workflows) {
+return mDBHelper.syncWorkflows(workflows);
+}
+});
 }
 
 /**
@@ -64,7 +74,13 @@ public class DataManager {
  */
 
 public Observable getDetailWorkflow(String id, Map options) {
-return mBaseApiManager.getTavernaApi().getDetailWorkflow(id, options);
+return mBaseApiManager.getTavernaApi().getDetailWorkflow(id, options)
+.concatMap(new Func1>() {
+@Override
+public Observable call(Workflow 
workflow) {
+return mDBHelper.syncWorkflow(workflow);
+}
+});
 }
 
 /**

[44/50] incubator-taverna-mobile git commit: add favourite logic

[ianwdunlop]

add favourite logic


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/b346c024
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/b346c024
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/b346c024

Branch: refs/heads/master
Commit: b346c0242de7373bbb97cf74883375e0203dffe7
Parents: c277f82
Author: Sagar 
Authored: Mon Jul 4 18:19:08 2016 +0530
Committer: Sagar 
Committed: Mon Jul 4 18:19:08 2016 +0530

--
 .../workflowdetail/WorkflowDetailFragment.java  | 24 
 .../workflowdetail/WorkflowDetailMvpView.java   |  4 ++
 .../workflowdetail/WorkflowDetailPresenter.java | 62 +++-
 3 files changed, 89 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/b346c024/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 5513947..de038fe 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
@@ -33,6 +33,7 @@ import android.widget.TextView;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
+import butterknife.OnClick;
 
 public class WorkflowDetailFragment extends Fragment implements 
WorkflowDetailMvpView {
 
@@ -59,6 +60,9 @@ public class WorkflowDetailFragment extends Fragment 
implements WorkflowDetailMv
 @BindView(R.id.tvDescription)
 WebView description;
 
+@BindView(R.id.ivFav)
+ImageView ivFavourite;
+
 @BindView(R.id.progressBar)
 ProgressBar mProgressBar;
 
@@ -126,6 +130,7 @@ public class WorkflowDetailFragment extends Fragment 
implements WorkflowDetailMv
 if (mConnectionInfo.isConnectingToInternet()) {
 
 mWorkflowDetailPresenter.loadWorkflowDetail(id);
+mWorkflowDetailPresenter.getFavourite(id);
 } else {
 
 mProgressBar.setVisibility(View.GONE);
@@ -136,6 +141,11 @@ public class WorkflowDetailFragment extends Fragment 
implements WorkflowDetailMv
 
 }
 
+@OnClick(R.id.ivFav)
+void favClick(View v){
+mWorkflowDetailPresenter.setFavourite(id);
+}
+
 @Override
 public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
 super.onCreateOptionsMenu(menu, inflater);
@@ -269,6 +279,20 @@ public class WorkflowDetailFragment extends Fragment 
implements WorkflowDetailMv
 }
 
 @Override
+public void setFavouriteIcon() {
+mWorkflowDetailPresenter.getFavourite(id);
+}
+
+@Override
+public void getFavouriteIcon(boolean b) {
+if(b){
+ivFavourite.setImageResource(R.drawable.ic_star_black_24dp);
+}else{
+ivFavourite.setImageResource(R.drawable.ic_star_border_black_24dp);
+}
+}
+
+@Override
 public void onDestroyView() {
 super.onDestroyView();
 mWorkflowDetailPresenter.detachView();

http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/b346c024/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailMvpView.java
--
diff --git 
a/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailMvpView.java
 
b/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailMvpView.java
index b7110c1..8710bcc 100644
--- 
a/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailMvpView.java
+++ 
b/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailMvpView.java
@@ -19,4 +19,8 @@ public interface WorkflowDetailMvpView extends MvpView {
 void showLicense(License license);
 
 void showLicenseProgress(boolean b);
+
+void setFavouriteIcon();
+
+void getFavouriteIcon(boolean b);
 }

http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/b346c024/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailPresenter.java
--
diff --git 
a/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailPresenter.java
 
b/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailPresenter.java
index 511498f..43fcd37 100644
--- 
a/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailPresenter.java
+++ 
b/app/src/main/java/org/apache/taverna/mobi

[46/50] incubator-taverna-mobile git commit: remove DB error

[ianwdunlop]

remove DB error


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/e864a5ce
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/e864a5ce
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/e864a5ce

Branch: refs/heads/master
Commit: e864a5ce9e7fc3adfe858dadb6084ec4fd1e6d79
Parents: bc28bdb
Author: Sagar 
Authored: Mon Jul 4 22:59:10 2016 +0530
Committer: Sagar 
Committed: Mon Jul 4 22:59:10 2016 +0530

--
 .../mobile/ui/workflowdetail/WorkflowDetailFragment.java  |  1 -
 .../mobile/ui/workflowdetail/WorkflowDetailPresenter.java | 10 --
 2 files changed, 4 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/e864a5ce/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 de038fe..d135865 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
@@ -130,7 +130,6 @@ public class WorkflowDetailFragment extends Fragment 
implements WorkflowDetailMv
 if (mConnectionInfo.isConnectingToInternet()) {
 
 mWorkflowDetailPresenter.loadWorkflowDetail(id);
-mWorkflowDetailPresenter.getFavourite(id);
 } else {
 
 mProgressBar.setVisibility(View.GONE);

http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/e864a5ce/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailPresenter.java
--
diff --git 
a/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailPresenter.java
 
b/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailPresenter.java
index 43fcd37..519e41f 100644
--- 
a/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailPresenter.java
+++ 
b/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailPresenter.java
@@ -38,7 +38,7 @@ public class WorkflowDetailPresenter extends 
BasePresenter

[47/50] incubator-taverna-mobile git commit: remove checkstyle error

[ianwdunlop]

remove checkstyle error


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/4a4980c3
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/4a4980c3
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/4a4980c3

Branch: refs/heads/master
Commit: 4a4980c3fc18651f9098b5d1787db6a4c5f41913
Parents: e864a5c
Author: Sagar 
Authored: Mon Jul 4 23:04:07 2016 +0530
Committer: Sagar 
Committed: Mon Jul 4 23:04:07 2016 +0530

--
 .../java/org/apache/taverna/mobile/data/local/DBHelper.java  | 5 +
 .../mobile/ui/workflowdetail/WorkflowDetailFragment.java | 8 
 2 files changed, 5 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/4a4980c3/app/src/main/java/org/apache/taverna/mobile/data/local/DBHelper.java
--
diff --git 
a/app/src/main/java/org/apache/taverna/mobile/data/local/DBHelper.java 
b/app/src/main/java/org/apache/taverna/mobile/data/local/DBHelper.java
index 3570f03..94719ec 100644
--- a/app/src/main/java/org/apache/taverna/mobile/data/local/DBHelper.java
+++ b/app/src/main/java/org/apache/taverna/mobile/data/local/DBHelper.java
@@ -140,13 +140,12 @@ public class DBHelper {
 
 subscriber.onNext(workflow1.isFavourite());
 subscriber.onCompleted();
-}else{
+} else {
 
 subscriber.onError(null);
 }
 
 
-
 }
 });
 }
@@ -168,7 +167,5 @@ public class DBHelper {
 }
 
 
-
-
 }
 

http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/4a4980c3/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 d135865..908589c 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
@@ -141,7 +141,7 @@ public class WorkflowDetailFragment extends Fragment 
implements WorkflowDetailMv
 }
 
 @OnClick(R.id.ivFav)
-void favClick(View v){
+void favClick(View v) {
 mWorkflowDetailPresenter.setFavourite(id);
 }
 
@@ -279,14 +279,14 @@ public class WorkflowDetailFragment extends Fragment 
implements WorkflowDetailMv
 
 @Override
 public void setFavouriteIcon() {
-mWorkflowDetailPresenter.getFavourite(id);
+mWorkflowDetailPresenter.getFavourite(id);
 }
 
 @Override
 public void getFavouriteIcon(boolean b) {
-if(b){
+if (b) {
 ivFavourite.setImageResource(R.drawable.ic_star_black_24dp);
-}else{
+} else {
 ivFavourite.setImageResource(R.drawable.ic_star_border_black_24dp);
 }
 }

[27/50] incubator-taverna-mobile git commit: add DBflow library

[ianwdunlop]

add DBflow library


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/eb2e43a9
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/eb2e43a9
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/eb2e43a9

Branch: refs/heads/master
Commit: eb2e43a12c148a651585ce6d0e21409e80c2
Parents: fa136ed
Author: Sagar 
Authored: Sat Jul 2 18:39:38 2016 +0530
Committer: Sagar 
Committed: Sat Jul 2 18:39:38 2016 +0530

--
 app/build.gradle | 5 +
 build.gradle | 1 +
 2 files changed, 6 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/eb2e43a9/app/build.gradle
--
diff --git a/app/build.gradle b/app/build.gradle
index 80f7117..645e757 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -64,4 +64,9 @@ dependencies {
 
 compile 'com.github.bumptech.glide:glide:3.6.0'
 compile 'com.caverock:androidsvg:1.2.1'
+
+
+apt "com.github.Raizlabs.DBFlow:dbflow-processor:3.0.1"
+compile "com.github.Raizlabs.DBFlow:dbflow-core:3.0.1"
+compile "com.github.Raizlabs.DBFlow:dbflow:3.0.1"
 }

http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/eb2e43a9/build.gradle
--
diff --git a/build.gradle b/build.gradle
index 36d6192..6f3f3db 100644
--- a/build.gradle
+++ b/build.gradle
@@ -17,5 +17,6 @@ buildscript {
 allprojects {
 repositories {
 jcenter()
+maven { url "https://www.jitpack.io"; }
 }
 }

[43/50] incubator-taverna-mobile git commit: add favourite button background

[ianwdunlop]

add favourite button background


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/c277f827
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/c277f827
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/c277f827

Branch: refs/heads/master
Commit: c277f827dfed129062ff9d2b503d9a890f51bd90
Parents: 5121e2e
Author: Sagar 
Authored: Mon Jul 4 18:18:21 2016 +0530
Committer: Sagar 
Committed: Mon Jul 4 18:18:21 2016 +0530

--
 app/src/main/res/drawable/background_fav_button.xml | 12 
 1 file changed, 12 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/c277f827/app/src/main/res/drawable/background_fav_button.xml
--
diff --git a/app/src/main/res/drawable/background_fav_button.xml 
b/app/src/main/res/drawable/background_fav_button.xml
new file mode 100644
index 000..35d8a38
--- /dev/null
+++ b/app/src/main/res/drawable/background_fav_button.xml
@@ -0,0 +1,12 @@
+
+http://schemas.android.com/apk/res/android";
+android:shape="oval">
+
+
+
+
+
\ No newline at end of file

[38/50] incubator-taverna-mobile git commit: DB error remove

[ianwdunlop]

DB error remove


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/7fa84c7b
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/7fa84c7b
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/7fa84c7b

Branch: refs/heads/master
Commit: 7fa84c7b9a63c0f677e6c4d9c6156094edc267ae
Parents: 4d553b7
Author: Sagar 
Authored: Mon Jul 4 16:11:20 2016 +0530
Committer: Sagar 
Committed: Mon Jul 4 16:11:20 2016 +0530

--
 .../taverna/mobile/data/local/DBHelper.java | 29 
 1 file changed, 18 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/7fa84c7b/app/src/main/java/org/apache/taverna/mobile/data/local/DBHelper.java
--
diff --git 
a/app/src/main/java/org/apache/taverna/mobile/data/local/DBHelper.java 
b/app/src/main/java/org/apache/taverna/mobile/data/local/DBHelper.java
index a6a86f8..7f3d538 100644
--- a/app/src/main/java/org/apache/taverna/mobile/data/local/DBHelper.java
+++ b/app/src/main/java/org/apache/taverna/mobile/data/local/DBHelper.java
@@ -29,7 +29,9 @@ public class DBHelper {
 for (Workflow workflow : workflows.getWorkflowList()) {
 if (!workflow.exists()) {
 workflow.save();
+
 } else {
+
 updateWorkflow(workflow).save();
 }
 
@@ -41,32 +43,34 @@ public class DBHelper {
 }
 
 private Workflow updateWorkflow(Workflow workflow) {
+
 Workflow workflow1 = SQLite.select()
 .from(Workflow.class)
 .where(Workflow_Table.id.eq(workflow.getId()))
 .querySingle();
+
 if (workflow1 != null) {
-if (workflow.getDescription() == null || 
!workflow.getDescription().equals(workflow1.getDescription())) {
+if (workflow.getDescription() != null) {
 
 workflow1.setDescription(workflow.getDescription());
 }
-if (workflow.getUpdatedAt() == null || 
!workflow.getUpdatedAt().equals(workflow1.getUpdatedAt())) {
+if (workflow.getUpdatedAt() != null ) {
 
 workflow1.setUpdatedAt(workflow.getUpdatedAt());
 }
-if (workflow.getSvgUri() == null || 
!workflow.getSvgUri().equals(workflow1.getSvgUri())) {
+if (workflow.getSvgUri() != null ) {
 
 workflow1.setSvgUri(workflow.getSvgUri());
 }
-if (workflow.getLicenseType() == null || 
!workflow.getLicenseType().equals(workflow1.getLicenseType())) {
+if (workflow.getLicenseType() != null ) {
 
 workflow1.setLicenseType(workflow.getLicenseType());
 }
-if (workflow.getContentUri() == null || 
!workflow.getContentUri().equals(workflow1.getContentUri())) {
+if (workflow.getContentUri() != null ) {
 
 workflow1.setContentUri(workflow.getContentUri());
 }
-if (workflow.getContentType() == null || 
!workflow.getContentType().equals(workflow1.getContentType())) {
+if (workflow.getContentType() != null ) {
 
 workflow1.setContentUri(workflow.getContentType());
 }
@@ -82,7 +86,7 @@ public class DBHelper {
 workflow1.setVersion(workflow.getVersion());
 
 }
-return workflow;
+return workflow1;
 }
 
 
@@ -91,10 +95,13 @@ public class DBHelper {
 @Override
 public void call(Subscriber subscriber) {
 if (subscriber.isUnsubscribed()) return;
-workflow.getType().save();
-workflow.getUploader().save();
-workflow.getLicenseType().save();
-workflow.save();
+if (!workflow.exists()) {
+workflow.save();
+
+} else {
+
+updateWorkflow(workflow).save();
+}
 subscriber.onNext(workflow);
 subscriber.onCompleted();
 }

[25/50] incubator-taverna-mobile git commit: add progress dialog for license loading

[ianwdunlop]

add progress dialog for license loading


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/73e86f9e
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/73e86f9e
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/73e86f9e

Branch: refs/heads/master
Commit: 73e86f9e1d4638f794e82cf02a883d92bc4b780b
Parents: 608a61c
Author: Sagar 
Authored: Sat Jul 2 00:43:38 2016 +0530
Committer: Sagar 
Committed: Sat Jul 2 00:43:38 2016 +0530

--
 .../ui/workflowdetail/WorkflowDetailFragment.java | 14 +-
 .../ui/workflowdetail/WorkflowDetailMvpView.java  |  4 +++-
 .../ui/workflowdetail/WorkflowDetailPresenter.java|  7 ---
 3 files changed, 20 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/73e86f9e/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 bcd4f57..90302a1 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
@@ -11,6 +11,7 @@ import org.apache.taverna.mobile.data.model.License;
 import org.apache.taverna.mobile.data.model.User;
 import org.apache.taverna.mobile.utils.ConnectionInfo;
 
+import android.app.ProgressDialog;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.design.widget.Snackbar;
@@ -81,6 +82,8 @@ public class WorkflowDetailFragment extends Fragment 
implements WorkflowDetailMv
 
 private String licenceId = null;
 
+private ProgressDialog dialog;
+
 public static WorkflowDetailFragment newInstance(String id) {
 
 Bundle args = new Bundle();
@@ -226,7 +229,7 @@ public class WorkflowDetailFragment extends Fragment 
implements WorkflowDetailMv
 }
 
 @Override
-public void showLicence(License license) {
+public void showLicense(License license) {
 AlertDialog.Builder dialogBuilder = new 
AlertDialog.Builder(getContext());
 
 LayoutInflater inflater = getActivity().getLayoutInflater();
@@ -257,6 +260,15 @@ public class WorkflowDetailFragment extends Fragment 
implements WorkflowDetailMv
 }
 
 @Override
+public void showLicenseProgress(boolean b) {
+if (b) {
+dialog = ProgressDialog.show(getContext(), "Loading", "Please 
wait...", true, true);
+} else {
+dialog.dismiss();
+}
+}
+
+@Override
 public void onDestroyView() {
 super.onDestroyView();
 mWorkflowDetailPresenter.detachView();

http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/73e86f9e/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailMvpView.java
--
diff --git 
a/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailMvpView.java
 
b/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailMvpView.java
index 30e1687..c0136a5 100644
--- 
a/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailMvpView.java
+++ 
b/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailMvpView.java
@@ -16,5 +16,7 @@ public interface WorkflowDetailMvpView extends MvpView {
 
 void showErrorSnackBar(String error);
 
-void showLicence(License license);
+void showLicense(License license);
+
+void showLicenseProgress(boolean b);
 }

http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/73e86f9e/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailPresenter.java
--
diff --git 
a/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailPresenter.java
 
b/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailPresenter.java
index c52584a..5b5f2af 100644
--- 
a/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailPresenter.java
+++ 
b/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailPresenter.java
@@ -90,6 +90,7 @@ public class WorkflowDetailPresenter extends 
BasePresenter() {
 @Override
 public void onCompleted() {
-
+getMvpView().showLicenseProgress(false);
 }
 
 @Over

[28/50] incubator-taverna-mobile git commit: single java bean for detailworkflow and workflow

[ianwdunlop]

single java bean for detailworkflow and workflow


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/bcf2a668
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/bcf2a668
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/bcf2a668

Branch: refs/heads/master
Commit: bcf2a668c713cd022969326cb24fb6c621bc1244
Parents: eb2e43a
Author: Sagar 
Authored: Sat Jul 2 19:01:50 2016 +0530
Committer: Sagar 
Committed: Sat Jul 2 19:01:50 2016 +0530

--
 .../apache/taverna/mobile/data/DataManager.java |   4 +-
 .../mobile/data/model/DetailWorkflow.java   | 282 ---
 .../taverna/mobile/data/model/Workflow.java | 168 +--
 .../mobile/data/remote/TavernaService.java  |   4 +-
 .../workflowdetail/WorkflowDetailFragment.java  |  22 +-
 .../workflowdetail/WorkflowDetailMvpView.java   |   4 +-
 .../workflowdetail/WorkflowDetailPresenter.java |  10 +-
 7 files changed, 160 insertions(+), 334 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/bcf2a668/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 6d8982f..e35cbb5 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
@@ -20,7 +20,7 @@ package org.apache.taverna.mobile.data;
 
 import org.apache.taverna.mobile.data.model.Announcements;
 import org.apache.taverna.mobile.data.model.DetailAnnouncement;
-import org.apache.taverna.mobile.data.model.DetailWorkflow;
+import org.apache.taverna.mobile.data.model.Workflow;
 import org.apache.taverna.mobile.data.model.License;
 import org.apache.taverna.mobile.data.model.User;
 import org.apache.taverna.mobile.data.model.Workflows;
@@ -63,7 +63,7 @@ public class DataManager {
  * @return Detail of  Workflow
  */
 
-public Observable getDetailWorkflow(String id, Map options) {
+public Observable getDetailWorkflow(String id, Map options) {
 return mBaseApiManager.getTavernaApi().getDetailWorkflow(id, options);
 }
 

http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/bcf2a668/app/src/main/java/org/apache/taverna/mobile/data/model/DetailWorkflow.java
--
diff --git 
a/app/src/main/java/org/apache/taverna/mobile/data/model/DetailWorkflow.java 
b/app/src/main/java/org/apache/taverna/mobile/data/model/DetailWorkflow.java
deleted file mode 100644
index b4e072f..000
--- a/app/src/main/java/org/apache/taverna/mobile/data/model/DetailWorkflow.java
+++ /dev/null
@@ -1,282 +0,0 @@
-/*
- * 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.
- */
-package org.apache.taverna.mobile.data.model;
-
-
-import org.simpleframework.xml.Attribute;
-import org.simpleframework.xml.Element;
-import org.simpleframework.xml.ElementList;
-import org.simpleframework.xml.Root;
-
-import android.os.Parcel;
-import android.os.Parcelable;
-
-import java.util.List;
-
-@Root(name = "workflow")
-public class DetailWorkflow implements Parcelable {
-
-@Attribute(name = "resource", required = false)
-String resource;
-
-@Attribute(name = "uri", required = false)
-String uri;
-
-@Attribute(name = "id", required = false)
-String id;
-
-@Attribute(name = "version", required = false)
-String version;
-
-@Element(name = "id")
-private String elementId;
-
-@Element(name = "title")
-private String title;
-
-@Element(name = "description", required = false)
-String description;
-
-@Element(name = "type")
-private Type type;
-
-@Element(name = "uploader", required = false)
-private Uploader uploader;
-
-@Element(name = "created-at", required = false)
-private Str

[41/50] incubator-taverna-mobile git commit: add svg support to gradle

[ianwdunlop]

add svg support to gradle


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/ea4b5ae4
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/ea4b5ae4
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/ea4b5ae4

Branch: refs/heads/master
Commit: ea4b5ae4973af08da2bb4c1434267f7016ba00e0
Parents: d21d49d
Author: Sagar 
Authored: Mon Jul 4 18:17:23 2016 +0530
Committer: Sagar 
Committed: Mon Jul 4 18:17:23 2016 +0530

--
 app/build.gradle | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/ea4b5ae4/app/build.gradle
--
diff --git a/app/build.gradle b/app/build.gradle
index ccdadf9..1b426de 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -16,6 +16,7 @@ android {
 targetSdkVersion 21
 versionCode 1
 versionName "1.0"
+vectorDrawables.useSupportLibrary = true
 }
 buildTypes {
 release {

[39/50] incubator-taverna-mobile git commit: add favourite workflow in DB and data layer

[ianwdunlop]

add favourite workflow in DB and data layer


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/526e74db
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/526e74db
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/526e74db

Branch: refs/heads/master
Commit: 526e74dbaf001f425d281d8ec074c3d9db45b47e
Parents: 7fa84c7
Author: Sagar 
Authored: Mon Jul 4 18:16:19 2016 +0530
Committer: Sagar 
Committed: Mon Jul 4 18:16:19 2016 +0530

--
 .../apache/taverna/mobile/data/DataManager.java | 16 +
 .../taverna/mobile/data/local/DBHelper.java | 71 ++--
 2 files changed, 82 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/526e74db/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 78c2e89..ce414ad 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
@@ -99,4 +99,20 @@ public class DataManager {
 return mBaseApiManager.getTavernaApi().getLicenseDetail(id, options);
 }
 
+/**
+ * @return Is Workflow toggle Favourite or not
+ */
+
+public Observable setFavoriteWorkflow(String id) {
+return mDBHelper.setFavouriteWorkflow(id);
+}
+
+/**
+ * @return Is Workflow  Favourite or not
+ */
+
+public Observable getFavoriteWorkflow(String id) {
+return mDBHelper.getFavouriteWorkflow(id);
+}
+
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/526e74db/app/src/main/java/org/apache/taverna/mobile/data/local/DBHelper.java
--
diff --git 
a/app/src/main/java/org/apache/taverna/mobile/data/local/DBHelper.java 
b/app/src/main/java/org/apache/taverna/mobile/data/local/DBHelper.java
index 7f3d538..3570f03 100644
--- a/app/src/main/java/org/apache/taverna/mobile/data/local/DBHelper.java
+++ b/app/src/main/java/org/apache/taverna/mobile/data/local/DBHelper.java
@@ -28,6 +28,7 @@ public class DBHelper {
 if (subscriber.isUnsubscribed()) return;
 for (Workflow workflow : workflows.getWorkflowList()) {
 if (!workflow.exists()) {
+workflow.setFavourite(false);
 workflow.save();
 
 } else {
@@ -54,27 +55,31 @@ public class DBHelper {
 
 workflow1.setDescription(workflow.getDescription());
 }
-if (workflow.getUpdatedAt() != null ) {
+if (workflow.getUpdatedAt() != null) {
 
 workflow1.setUpdatedAt(workflow.getUpdatedAt());
 }
-if (workflow.getSvgUri() != null ) {
+if (workflow.getSvgUri() != null) {
 
 workflow1.setSvgUri(workflow.getSvgUri());
 }
-if (workflow.getLicenseType() != null ) {
+if (workflow.getLicenseType() != null) {
 
 workflow1.setLicenseType(workflow.getLicenseType());
 }
-if (workflow.getContentUri() != null ) {
+if (workflow.getContentUri() != null) {
 
 workflow1.setContentUri(workflow.getContentUri());
 }
-if (workflow.getContentType() != null ) {
+if (workflow.getContentType() != null) {
 
 workflow1.setContentUri(workflow.getContentType());
 }
+if (workflow.getElementId() != null) {
 
+workflow1.setElementId(workflow.getElementId());
+}
+workflow1.setFavourite(workflow1.isFavourite());
 workflow1.setTitle(workflow.getTitle());
 workflow1.setType(workflow.getType());
 workflow1.setUploader(workflow.getUploader());
@@ -109,5 +114,61 @@ public class DBHelper {
 }
 
 
+public Observable setFavouriteWorkflow(final String id) {
+return Observable.create(new Observable.OnSubscribe() {
+@Override
+public void call(Subscriber subscriber) {
+if (subscriber.isUnsubscribed()) return;
+subscriber.onNext(updateFavouriteWorkflow(id));
+subscriber.onCompleted();
+}
+});
+}
+
+
+public Observable getFavouriteWorkflow(final String id) {
+return Observable.create(new Observable.OnSubscribe() {
+@Override
+public void call(Subscriber s

[30/50] incubator-taverna-mobile git commit: add dbflow annotation to Workflow

[ianwdunlop]

add dbflow annotation to Workflow


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/91c0f35f
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/91c0f35f
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/91c0f35f

Branch: refs/heads/master
Commit: 91c0f35fb1880fcaefd9159a2b199c6f050e7889
Parents: 396a2d4
Author: Sagar 
Authored: Sat Jul 2 19:19:43 2016 +0530
Committer: Sagar 
Committed: Sat Jul 2 19:19:43 2016 +0530

--
 .../apache/taverna/mobile/data/model/Type.java  | 12 +
 .../taverna/mobile/data/model/Uploader.java | 13 ++
 .../taverna/mobile/data/model/Workflow.java | 46 
 3 files changed, 62 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/91c0f35f/app/src/main/java/org/apache/taverna/mobile/data/model/Type.java
--
diff --git a/app/src/main/java/org/apache/taverna/mobile/data/model/Type.java 
b/app/src/main/java/org/apache/taverna/mobile/data/model/Type.java
index b22d7bc..a84a3c3 100644
--- a/app/src/main/java/org/apache/taverna/mobile/data/model/Type.java
+++ b/app/src/main/java/org/apache/taverna/mobile/data/model/Type.java
@@ -18,6 +18,12 @@
  */
 package org.apache.taverna.mobile.data.model;
 
+import com.raizlabs.android.dbflow.annotation.Column;
+import com.raizlabs.android.dbflow.annotation.ModelContainer;
+import com.raizlabs.android.dbflow.annotation.PrimaryKey;
+import com.raizlabs.android.dbflow.annotation.Table;
+
+import org.apache.taverna.mobile.data.local.TavernaDatabase;
 import org.simpleframework.xml.Attribute;
 import org.simpleframework.xml.Root;
 import org.simpleframework.xml.Text;
@@ -25,18 +31,24 @@ import org.simpleframework.xml.Text;
 import android.os.Parcel;
 import android.os.Parcelable;
 
+@Table(database = TavernaDatabase.class)
+@ModelContainer
 @Root(name = "type")
 public class Type implements Parcelable {
 
+@Column
 @Attribute(name = "resource", required = false)
 String resource;
 
+@Column
 @Attribute(name = "uri", required = false)
 String uri;
 
+@PrimaryKey
 @Attribute(name = "id", required = false)
 String id;
 
+@Column
 @Text
 String content;
 

http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/91c0f35f/app/src/main/java/org/apache/taverna/mobile/data/model/Uploader.java
--
diff --git 
a/app/src/main/java/org/apache/taverna/mobile/data/model/Uploader.java 
b/app/src/main/java/org/apache/taverna/mobile/data/model/Uploader.java
index 41f3be6..b562cb5 100644
--- a/app/src/main/java/org/apache/taverna/mobile/data/model/Uploader.java
+++ b/app/src/main/java/org/apache/taverna/mobile/data/model/Uploader.java
@@ -18,6 +18,12 @@
  */
 package org.apache.taverna.mobile.data.model;
 
+import com.raizlabs.android.dbflow.annotation.Column;
+import com.raizlabs.android.dbflow.annotation.ModelContainer;
+import com.raizlabs.android.dbflow.annotation.PrimaryKey;
+import com.raizlabs.android.dbflow.annotation.Table;
+
+import org.apache.taverna.mobile.data.local.TavernaDatabase;
 import org.simpleframework.xml.Attribute;
 import org.simpleframework.xml.Root;
 import org.simpleframework.xml.Text;
@@ -25,17 +31,24 @@ import org.simpleframework.xml.Text;
 import android.os.Parcel;
 import android.os.Parcelable;
 
+@Table(database = TavernaDatabase.class)
+@ModelContainer
 @Root(name = "uploader")
 public class Uploader implements Parcelable {
+
+@Column
 @Attribute(name = "resource", required = false)
 String resource;
 
+@Column
 @Attribute(name = "uri", required = false)
 String uri;
 
+@PrimaryKey
 @Attribute(name = "id", required = false)
 String id;
 
+@Column
 @Text
 String content;
 

http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/91c0f35f/app/src/main/java/org/apache/taverna/mobile/data/model/Workflow.java
--
diff --git 
a/app/src/main/java/org/apache/taverna/mobile/data/model/Workflow.java 
b/app/src/main/java/org/apache/taverna/mobile/data/model/Workflow.java
index 24f72f2..cafa073 100644
--- a/app/src/main/java/org/apache/taverna/mobile/data/model/Workflow.java
+++ b/app/src/main/java/org/apache/taverna/mobile/data/model/Workflow.java
@@ -19,6 +19,13 @@
 package org.apache.taverna.mobile.data.model;
 
 
+import com.raizlabs.android.dbflow.annotation.Column;
+import com.raizlabs.android.dbflow.annotation.ForeignKey;
+import com.raizlabs.android.dbflow.annotation.ModelContainer;
+import com.raizlabs.android.dbflow.annotation.PrimaryKey;
+import com.rai

[29/50] incubator-taverna-mobile git commit: DBflow setup

[ianwdunlop]

DBflow setup


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/396a2d4a
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/396a2d4a
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/396a2d4a

Branch: refs/heads/master
Commit: 396a2d4a1edbea45bf187e34118afb394e23b4a0
Parents: bcf2a66
Author: Sagar 
Authored: Sat Jul 2 19:10:14 2016 +0530
Committer: Sagar 
Committed: Sat Jul 2 19:10:14 2016 +0530

--
 app/src/main/AndroidManifest.xml| 93 ++--
 .../taverna/mobile/TavernaApplication.java  | 16 
 .../mobile/data/local/TavernaBaseModel.java |  7 ++
 .../mobile/data/local/TavernaDatabase.java  | 13 +++
 4 files changed, 83 insertions(+), 46 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/396a2d4a/app/src/main/AndroidManifest.xml
--
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index b2e0872..8d5e2b7 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -19,95 +19,96 @@ See the License for the specific language governing 
permissions and
 limitations under the License.
 -->
 http://schemas.android.com/apk/res/android";
-package="org.apache.taverna.mobile" >
+  package="org.apache.taverna.mobile">
 
-
-
+
+
 
 
 
+android:name=".TavernaApplication"
+android:allowBackup="true"
+android:icon="@mipmap/ic_launcher"
+android:label="@string/app_name"
+android:theme="@style/Theme.Taverna">
 
+android:name=".activities.LoginActivity"
+android:label="@string/app_name">
 
 
+android:name=".activities.FlashScreenActivity"
+android:label="@string/title_activity_flash_screen">
 
-
+
 
-
+
 
 
 
+android:name=".activities.DashboardMainActivity"
+android:label="@string/title_activity_dashboard_main"
+android:launchMode="singleTop">
 
-
+
 
 
 
+android:name="android.app.searchable"
+android:resource="@xml/searchable"/>
 
 
+android:name=".activities.WorkflowDetailActivity"
+android:label="@string/title_activity_workflow_detail"
+android:parentActivityName=".activities.DashboardMainActivity">
 
+android:name="android.support.PARENT_ACTIVITY"
+
android:value="org.apache.taverna.mobile.activities.DashboardMainActivity"/>
 
 
 
+android:name=".broadcastreceivers.WorkflowDownloadReceiver"
+android:enabled="true"
+android:exported="true">
 
-
+
 
 
 
 
+android:name=".activities.SettingsActivity"
+android:label="@string/title_activity_settings"
+android:parentActivityName=".activities.DashboardMainActivity">
 
+android:name="android.support.PARENT_ACTIVITY"
+
android:value="org.apache.taverna.mobile.activities.DashboardMainActivity"/>
 
 
+android:name=".activities.RunResult"
+android:label="@string/title_activity_run_result"
+
android:parentActivityName=".activities.WorkflowDetailActivity">
 
+android:name="android.support.PARENT_ACTIVITY"
+
android:value="org.apache.taverna.mobile.activities.WorkflowDetailActivity"/>
 
 
+android:name="com.dropbox.client2.android.AuthActivity"
+android:launchMode="singleTask"
+android:configChanges="orientation|keyboard">
 
 
-
-
+
+
 
-
+
 
 
 
+android:parentActivityName=".activities.DashboardMainActivity">
 
+
android:value="org.apache.taverna.mobile.activities.DashboardMainActivity"/>
 
 
 

http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/396a2d4a/app/src/main/java/org/apache/taverna/mobile/TavernaApplication.java
--

[21/50] incubator-taverna-mobile git commit: add licence service to data manager

[ianwdunlop]

add licence service to data manager


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/087ea562
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/087ea562
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/087ea562

Branch: refs/heads/master
Commit: 087ea562231911d41120ab6ed4936233b1c22983
Parents: 8d5f513
Author: Sagar 
Authored: Fri Jul 1 23:52:57 2016 +0530
Committer: Sagar 
Committed: Fri Jul 1 23:52:57 2016 +0530

--
 .../java/org/apache/taverna/mobile/data/DataManager.java| 9 +
 1 file changed, 9 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/087ea562/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 9fc5452..4651d16 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
@@ -21,6 +21,7 @@ package org.apache.taverna.mobile.data;
 import org.apache.taverna.mobile.data.model.Announcements;
 import org.apache.taverna.mobile.data.model.DetailAnnouncement;
 import org.apache.taverna.mobile.data.model.DetailWorkflow;
+import org.apache.taverna.mobile.data.model.License;
 import org.apache.taverna.mobile.data.model.User;
 import org.apache.taverna.mobile.data.model.Workflows;
 import org.apache.taverna.mobile.data.remote.BaseApiManager;
@@ -74,4 +75,12 @@ public class DataManager {
 return mBaseApiManager.getTavernaApi().getUserDetail(id, options);
 }
 
+/**
+ * @return Detail of  Licence
+ */
+
+public Observable getLicenceDetail(String id, Map 
options) {
+return mBaseApiManager.getTavernaApi().getLicenceDetail(id, options);
+}
+
 }
\ No newline at end of file

[34/50] incubator-taverna-mobile git commit: remove checkstyle error

[ianwdunlop]

remove checkstyle error


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/fb62724e
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/fb62724e
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/fb62724e

Branch: refs/heads/master
Commit: fb62724e6207d0c42aef6552698e989bd6d68513
Parents: 1ca4100
Author: Sagar 
Authored: Sun Jul 3 13:42:58 2016 +0530
Committer: Sagar 
Committed: Sun Jul 3 13:42:58 2016 +0530

--
 .../main/java/org/apache/taverna/mobile/TavernaApplication.java| 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/fb62724e/app/src/main/java/org/apache/taverna/mobile/TavernaApplication.java
--
diff --git 
a/app/src/main/java/org/apache/taverna/mobile/TavernaApplication.java 
b/app/src/main/java/org/apache/taverna/mobile/TavernaApplication.java
index 0e37f40..096addc 100644
--- a/app/src/main/java/org/apache/taverna/mobile/TavernaApplication.java
+++ b/app/src/main/java/org/apache/taverna/mobile/TavernaApplication.java
@@ -7,7 +7,7 @@ import com.raizlabs.android.dbflow.config.FlowManager;
 
 import android.app.Application;
 
-public class TavernaApplication extends Application{
+public class TavernaApplication extends Application {
 
 @Override
 public void onCreate() {

[08/50] incubator-taverna-mobile git commit: add user and avatar javabean

[ianwdunlop]

add user and avatar javabean


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/60bfc6c7
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/60bfc6c7
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/60bfc6c7

Branch: refs/heads/master
Commit: 60bfc6c75df24abab38c9b6729f88cafea20ef0f
Parents: a4b1fdf
Author: Sagar 
Authored: Fri Jul 1 12:12:23 2016 +0530
Committer: Sagar 
Committed: Fri Jul 1 12:12:23 2016 +0530

--
 .../taverna/mobile/data/model/Avatar.java   |  78 
 .../apache/taverna/mobile/data/model/User.java  | 196 +++
 2 files changed, 274 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/60bfc6c7/app/src/main/java/org/apache/taverna/mobile/data/model/Avatar.java
--
diff --git a/app/src/main/java/org/apache/taverna/mobile/data/model/Avatar.java 
b/app/src/main/java/org/apache/taverna/mobile/data/model/Avatar.java
new file mode 100644
index 000..432a34c
--- /dev/null
+++ b/app/src/main/java/org/apache/taverna/mobile/data/model/Avatar.java
@@ -0,0 +1,78 @@
+package org.apache.taverna.mobile.data.model;
+
+
+import org.simpleframework.xml.Attribute;
+import org.simpleframework.xml.Root;
+
+import android.os.Parcel;
+import android.os.Parcelable;
+
+@Root(name = "avatar")
+public class Avatar implements Parcelable {
+
+@Attribute(name = "resource", required = false)
+private String resource;
+
+@Attribute(name = "uri", required = false)
+private String uri;
+
+@Attribute(name = "id", required = false)
+private String id;
+
+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;
+}
+
+public String getId() {
+return id;
+}
+
+public void setId(String id) {
+this.id = id;
+}
+
+@Override
+public int describeContents() {
+return 0;
+}
+
+@Override
+public void writeToParcel(Parcel dest, int flags) {
+dest.writeString(this.resource);
+dest.writeString(this.uri);
+dest.writeString(this.id);
+}
+
+public Avatar() {
+}
+
+protected Avatar(Parcel in) {
+this.resource = in.readString();
+this.uri = in.readString();
+this.id = in.readString();
+}
+
+public static final Parcelable.Creator CREATOR = new 
Parcelable.Creator() {
+@Override
+public Avatar createFromParcel(Parcel source) {
+return new Avatar(source);
+}
+
+@Override
+public Avatar[] newArray(int size) {
+return new Avatar[size];
+}
+};
+}

http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/60bfc6c7/app/src/main/java/org/apache/taverna/mobile/data/model/User.java
--
diff --git a/app/src/main/java/org/apache/taverna/mobile/data/model/User.java 
b/app/src/main/java/org/apache/taverna/mobile/data/model/User.java
new file mode 100644
index 000..f04aa93
--- /dev/null
+++ b/app/src/main/java/org/apache/taverna/mobile/data/model/User.java
@@ -0,0 +1,196 @@
+package org.apache.taverna.mobile.data.model;
+
+import org.simpleframework.xml.Attribute;
+import org.simpleframework.xml.Element;
+import org.simpleframework.xml.Root;
+
+import android.os.Parcel;
+import android.os.Parcelable;
+
+@Root(name="user")
+public class User implements Parcelable {
+
+@Attribute(name = "resource", required = false)
+private String resource;
+
+@Attribute(name = "uri", required = false)
+private String uri;
+
+@Attribute(name = "id", required = false)
+private String id;
+
+@Element(name = "id", required = false)
+private String elementId;
+
+@Element(name = "created-at", required = false)
+private String createdAt;
+
+@Element(name = "name", required = false)
+private String name;
+
+@Element(name = "description", required = false)
+private String description;
+
+@Element(name = "email", required = false)
+private String email;
+
+@Element(name = "city", required = false)
+private String city;
+
+@Element(name = "country", required = false)
+private String country;
+
+@Element(name = "website", required = false)
+private String website;
+
+@Element(name = "avatar",required = false)
+private Avatar avatar;
+
+public String getResource() {
+return resource;
+}
+
+public void setResource(String reso

[45/50] incubator-taverna-mobile git commit: replace vector drawable to png drawable

[ianwdunlop]

replace vector drawable to png drawable


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/bc28bdb5
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/bc28bdb5
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/bc28bdb5

Branch: refs/heads/master
Commit: bc28bdb5a8269d3a53c0995fea7825043d236425
Parents: b346c02
Author: Sagar 
Authored: Mon Jul 4 22:58:52 2016 +0530
Committer: Sagar 
Committed: Mon Jul 4 22:58:52 2016 +0530

--
 app/build.gradle|   1 -
 .../main/res/drawable-hdpi/ic_star_black_24dp.png   | Bin 0 -> 369 bytes
 .../res/drawable-hdpi/ic_star_border_black_24dp.png | Bin 0 -> 500 bytes
 .../main/res/drawable-mdpi/ic_star_black_24dp.png   | Bin 0 -> 263 bytes
 .../res/drawable-mdpi/ic_star_border_black_24dp.png | Bin 0 -> 332 bytes
 .../main/res/drawable-xhdpi/ic_star_black_24dp.png  | Bin 0 -> 467 bytes
 .../drawable-xhdpi/ic_star_border_black_24dp.png| Bin 0 -> 674 bytes
 .../main/res/drawable-xxhdpi/ic_star_black_24dp.png | Bin 0 -> 668 bytes
 .../drawable-xxhdpi/ic_star_border_black_24dp.png   | Bin 0 -> 971 bytes
 .../res/drawable-xxxhdpi/ic_star_black_24dp.png | Bin 0 -> 887 bytes
 .../drawable-xxxhdpi/ic_star_border_black_24dp.png  | Bin 0 -> 1301 bytes
 app/src/main/res/drawable/ic_star_black_24dp.xml|   9 -
 .../main/res/drawable/ic_star_border_black_24dp.xml |   9 -
 13 files changed, 19 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/bc28bdb5/app/build.gradle
--
diff --git a/app/build.gradle b/app/build.gradle
index 1b426de..ccdadf9 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -16,7 +16,6 @@ android {
 targetSdkVersion 21
 versionCode 1
 versionName "1.0"
-vectorDrawables.useSupportLibrary = true
 }
 buildTypes {
 release {

http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/bc28bdb5/app/src/main/res/drawable-hdpi/ic_star_black_24dp.png
--
diff --git a/app/src/main/res/drawable-hdpi/ic_star_black_24dp.png 
b/app/src/main/res/drawable-hdpi/ic_star_black_24dp.png
new file mode 100644
index 000..92a0f58
Binary files /dev/null and 
b/app/src/main/res/drawable-hdpi/ic_star_black_24dp.png differ

http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/bc28bdb5/app/src/main/res/drawable-hdpi/ic_star_border_black_24dp.png
--
diff --git a/app/src/main/res/drawable-hdpi/ic_star_border_black_24dp.png 
b/app/src/main/res/drawable-hdpi/ic_star_border_black_24dp.png
new file mode 100644
index 000..cb31ce2
Binary files /dev/null and 
b/app/src/main/res/drawable-hdpi/ic_star_border_black_24dp.png differ

http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/bc28bdb5/app/src/main/res/drawable-mdpi/ic_star_black_24dp.png
--
diff --git a/app/src/main/res/drawable-mdpi/ic_star_black_24dp.png 
b/app/src/main/res/drawable-mdpi/ic_star_black_24dp.png
new file mode 100644
index 000..a728afe
Binary files /dev/null and 
b/app/src/main/res/drawable-mdpi/ic_star_black_24dp.png differ

http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/bc28bdb5/app/src/main/res/drawable-mdpi/ic_star_border_black_24dp.png
--
diff --git a/app/src/main/res/drawable-mdpi/ic_star_border_black_24dp.png 
b/app/src/main/res/drawable-mdpi/ic_star_border_black_24dp.png
new file mode 100644
index 000..b753848
Binary files /dev/null and 
b/app/src/main/res/drawable-mdpi/ic_star_border_black_24dp.png differ

http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/bc28bdb5/app/src/main/res/drawable-xhdpi/ic_star_black_24dp.png
--
diff --git a/app/src/main/res/drawable-xhdpi/ic_star_black_24dp.png 
b/app/src/main/res/drawable-xhdpi/ic_star_black_24dp.png
new file mode 100644
index 000..c636ce8
Binary files /dev/null and 
b/app/src/main/res/drawable-xhdpi/ic_star_black_24dp.png differ

http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/bc28bdb5/app/src/main/res/drawable-xhdpi/ic_star_border_black_24dp.png
--
diff --git a/app/src/main/res/drawable-xhdpi/ic_star_border_black_24dp.png 
b/app/src/main/res/drawable-xhdpi/ic_star_border_black_24dp.png
new file mode 100644
index 000..4f978e7
Binary files /dev/null and 
b/

[09/50] incubator-taverna-mobile git commit: add user detail in taverna service

[ianwdunlop]

add user detail in taverna service


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/2bebdb56
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/2bebdb56
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/2bebdb56

Branch: refs/heads/master
Commit: 2bebdb56f6aedcc9aa37cb594805e3fc8ca4fc52
Parents: 60bfc6c
Author: Sagar 
Authored: Fri Jul 1 12:13:46 2016 +0530
Committer: Sagar 
Committed: Fri Jul 1 12:13:46 2016 +0530

--
 .../java/org/apache/taverna/mobile/data/remote/APIEndPoint.java | 2 ++
 .../org/apache/taverna/mobile/data/remote/TavernaService.java   | 5 +
 2 files changed, 7 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/2bebdb56/app/src/main/java/org/apache/taverna/mobile/data/remote/APIEndPoint.java
--
diff --git 
a/app/src/main/java/org/apache/taverna/mobile/data/remote/APIEndPoint.java 
b/app/src/main/java/org/apache/taverna/mobile/data/remote/APIEndPoint.java
index adf902b..fbaef25 100644
--- a/app/src/main/java/org/apache/taverna/mobile/data/remote/APIEndPoint.java
+++ b/app/src/main/java/org/apache/taverna/mobile/data/remote/APIEndPoint.java
@@ -21,9 +21,11 @@ package org.apache.taverna.mobile.data.remote;
 //This class contains all the Constants for API End Points
 
 public class APIEndPoint {
+
 public static final String ALL_ANNOUNCEMENT = "announcements.xml";
 public static final String ANNOUNCEMENT = "announcement.xml";
 public static final String ALL_WORKFLOW = "workflows.xml";
 public static final String WORKFLOW = "workflow.xml";
+public static final String USER="user.xml";
 
 }

http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/2bebdb56/app/src/main/java/org/apache/taverna/mobile/data/remote/TavernaService.java
--
diff --git 
a/app/src/main/java/org/apache/taverna/mobile/data/remote/TavernaService.java 
b/app/src/main/java/org/apache/taverna/mobile/data/remote/TavernaService.java
index e2d6bff..02bacef 100644
--- 
a/app/src/main/java/org/apache/taverna/mobile/data/remote/TavernaService.java
+++ 
b/app/src/main/java/org/apache/taverna/mobile/data/remote/TavernaService.java
@@ -21,6 +21,7 @@ package org.apache.taverna.mobile.data.remote;
 import org.apache.taverna.mobile.data.model.Announcements;
 import org.apache.taverna.mobile.data.model.DetailAnnouncement;
 import org.apache.taverna.mobile.data.model.DetailWorkflow;
+import org.apache.taverna.mobile.data.model.User;
 import org.apache.taverna.mobile.data.model.Workflows;
 
 import java.util.Map;
@@ -45,4 +46,8 @@ public interface TavernaService {
 @GET(APIEndPoint.WORKFLOW)
 Observable getDetailWorkflow(@Query("id") String id
 , @QueryMap Map options);
+
+@GET(APIEndPoint.USER)
+Observable getUserDetail(@Query("id") String id
+, @QueryMap Map options);
 }
\ No newline at end of file

[42/50] incubator-taverna-mobile git commit: add favourite imageview in layout

[ianwdunlop]

add favourite imageview in layout


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/5121e2e4
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/5121e2e4
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/5121e2e4

Branch: refs/heads/master
Commit: 5121e2e4f5db7e4421b91b53c83b54e81d31f75f
Parents: ea4b5ae
Author: Sagar 
Authored: Mon Jul 4 18:17:59 2016 +0530
Committer: Sagar 
Committed: Mon Jul 4 18:17:59 2016 +0530

--
 app/src/main/res/drawable/ic_star_black_24dp.xml|  9 +
 app/src/main/res/drawable/ic_star_border_black_24dp.xml |  9 +
 app/src/main/res/layout/fragment_detail_workflow.xml| 12 +++-
 3 files changed, 29 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/5121e2e4/app/src/main/res/drawable/ic_star_black_24dp.xml
--
diff --git a/app/src/main/res/drawable/ic_star_black_24dp.xml 
b/app/src/main/res/drawable/ic_star_black_24dp.xml
new file mode 100644
index 000..a87ca09
--- /dev/null
+++ b/app/src/main/res/drawable/ic_star_black_24dp.xml
@@ -0,0 +1,9 @@
+http://schemas.android.com/apk/res/android";
+android:width="24dp"
+android:height="24dp"
+android:viewportWidth="24.0"
+android:viewportHeight="24.0">
+
+

http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/5121e2e4/app/src/main/res/drawable/ic_star_border_black_24dp.xml
--
diff --git a/app/src/main/res/drawable/ic_star_border_black_24dp.xml 
b/app/src/main/res/drawable/ic_star_border_black_24dp.xml
new file mode 100644
index 000..b36536b
--- /dev/null
+++ b/app/src/main/res/drawable/ic_star_border_black_24dp.xml
@@ -0,0 +1,9 @@
+http://schemas.android.com/apk/res/android";
+android:width="24dp"
+android:height="24dp"
+android:viewportWidth="24.0"
+android:viewportHeight="24.0">
+
+

http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/5121e2e4/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 26c3ae2..a89ddc4 100644
--- a/app/src/main/res/layout/fragment_detail_workflow.xml
+++ b/app/src/main/res/layout/fragment_detail_workflow.xml
@@ -1,6 +1,7 @@
 
 http://schemas.android.com/apk/res/android";
+xmlns:app="http://schemas.android.com/apk/res-auto";
 android:id="@+id/rootLayout"
 android:orientation="vertical"
 android:layout_width="match_parent"
@@ -29,12 +30,21 @@
 android:layout_width="match_parent"
 android:scaleType="fitCenter"
 android:layout_height="300dp"/>
-
 
 
+
+
 

[36/50] incubator-taverna-mobile git commit: add DB helper layer

[ianwdunlop]

add DB helper layer


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/80108f11
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/80108f11
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/80108f11

Branch: refs/heads/master
Commit: 80108f119bce8100a269328271d6d6075e6952a1
Parents: e5ec7c3
Author: Sagar 
Authored: Mon Jul 4 14:59:12 2016 +0530
Committer: Sagar 
Committed: Mon Jul 4 14:59:12 2016 +0530

--
 .../taverna/mobile/data/local/DBHelper.java | 106 +++
 1 file changed, 106 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/80108f11/app/src/main/java/org/apache/taverna/mobile/data/local/DBHelper.java
--
diff --git 
a/app/src/main/java/org/apache/taverna/mobile/data/local/DBHelper.java 
b/app/src/main/java/org/apache/taverna/mobile/data/local/DBHelper.java
new file mode 100644
index 000..a6a86f8
--- /dev/null
+++ b/app/src/main/java/org/apache/taverna/mobile/data/local/DBHelper.java
@@ -0,0 +1,106 @@
+package org.apache.taverna.mobile.data.local;
+
+
+import com.raizlabs.android.dbflow.sql.language.SQLite;
+
+import org.apache.taverna.mobile.data.model.Workflow;
+import org.apache.taverna.mobile.data.model.Workflow_Table;
+import org.apache.taverna.mobile.data.model.Workflows;
+
+import android.support.annotation.Nullable;
+
+import rx.Observable;
+import rx.Subscriber;
+
+
+public class DBHelper {
+
+
+public DBHelper() {
+
+}
+
+@Nullable
+public Observable syncWorkflows(final Workflows workflows) {
+return Observable.create(new Observable.OnSubscribe() {
+@Override
+public void call(Subscriber subscriber) {
+if (subscriber.isUnsubscribed()) return;
+for (Workflow workflow : workflows.getWorkflowList()) {
+if (!workflow.exists()) {
+workflow.save();
+} else {
+updateWorkflow(workflow).save();
+}
+
+}
+subscriber.onNext(workflows);
+subscriber.onCompleted();
+}
+});
+}
+
+private Workflow updateWorkflow(Workflow workflow) {
+Workflow workflow1 = SQLite.select()
+.from(Workflow.class)
+.where(Workflow_Table.id.eq(workflow.getId()))
+.querySingle();
+if (workflow1 != null) {
+if (workflow.getDescription() == null || 
!workflow.getDescription().equals(workflow1.getDescription())) {
+
+workflow1.setDescription(workflow.getDescription());
+}
+if (workflow.getUpdatedAt() == null || 
!workflow.getUpdatedAt().equals(workflow1.getUpdatedAt())) {
+
+workflow1.setUpdatedAt(workflow.getUpdatedAt());
+}
+if (workflow.getSvgUri() == null || 
!workflow.getSvgUri().equals(workflow1.getSvgUri())) {
+
+workflow1.setSvgUri(workflow.getSvgUri());
+}
+if (workflow.getLicenseType() == null || 
!workflow.getLicenseType().equals(workflow1.getLicenseType())) {
+
+workflow1.setLicenseType(workflow.getLicenseType());
+}
+if (workflow.getContentUri() == null || 
!workflow.getContentUri().equals(workflow1.getContentUri())) {
+
+workflow1.setContentUri(workflow.getContentUri());
+}
+if (workflow.getContentType() == null || 
!workflow.getContentType().equals(workflow1.getContentType())) {
+
+workflow1.setContentUri(workflow.getContentType());
+}
+
+workflow1.setTitle(workflow.getTitle());
+workflow1.setType(workflow.getType());
+workflow1.setUploader(workflow.getUploader());
+workflow1.setPreviewUri(workflow.getPreviewUri());
+workflow1.setCreatedAt(workflow.getCreatedAt());
+workflow1.setResource(workflow.getResource());
+workflow1.setUri(workflow.getUri());
+workflow1.setId(workflow.getId());
+workflow1.setVersion(workflow.getVersion());
+
+}
+return workflow;
+}
+
+
+public Observable syncWorkflow(final Workflow workflow) {
+return Observable.create(new Observable.OnSubscribe() {
+@Override
+public void call(Subscriber subscriber) {
+if (subscriber.isUnsubscribed()) return;
+workflow.getType().save();
+workflow.getUploader().save();
+workflow.getLicenseType().save();
+workflow.save();
+subscriber.o

[31/50] incubator-taverna-mobile git commit: update java bean

[ianwdunlop]

update java bean


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/bd59537b
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/bd59537b
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/bd59537b

Branch: refs/heads/master
Commit: bd59537b7504d016c5f3c16b83a5b8880d8a796b
Parents: 91c0f35
Author: Sagar 
Authored: Sat Jul 2 23:42:08 2016 +0530
Committer: Sagar 
Committed: Sat Jul 2 23:42:08 2016 +0530

--
 .../taverna/mobile/data/model/LicenseType.java   | 15 ++-
 .../org/apache/taverna/mobile/data/model/Type.java   |  3 ++-
 .../apache/taverna/mobile/data/model/Uploader.java   |  3 ++-
 .../apache/taverna/mobile/data/model/Workflow.java   |  8 +---
 4 files changed, 23 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/bd59537b/app/src/main/java/org/apache/taverna/mobile/data/model/LicenseType.java
--
diff --git 
a/app/src/main/java/org/apache/taverna/mobile/data/model/LicenseType.java 
b/app/src/main/java/org/apache/taverna/mobile/data/model/LicenseType.java
index 968657d..c76e31d 100644
--- a/app/src/main/java/org/apache/taverna/mobile/data/model/LicenseType.java
+++ b/app/src/main/java/org/apache/taverna/mobile/data/model/LicenseType.java
@@ -19,23 +19,36 @@
 package org.apache.taverna.mobile.data.model;
 
 
+import com.raizlabs.android.dbflow.annotation.Column;
+import com.raizlabs.android.dbflow.annotation.ModelContainer;
+import com.raizlabs.android.dbflow.annotation.PrimaryKey;
+import com.raizlabs.android.dbflow.annotation.Table;
+
+import org.apache.taverna.mobile.data.local.TavernaBaseModel;
+import org.apache.taverna.mobile.data.local.TavernaDatabase;
 import org.simpleframework.xml.Attribute;
 import org.simpleframework.xml.Text;
 
 import android.os.Parcel;
 import android.os.Parcelable;
 
-public class LicenseType implements Parcelable {
+@Table(database = TavernaDatabase.class)
+@ModelContainer
+public class LicenseType extends TavernaBaseModel implements Parcelable {
 
+@Column
 @Attribute(name = "resource", required = false)
 String resource;
 
+@Column
 @Attribute(name = "uri", required = false)
 String uri;
 
+@PrimaryKey
 @Attribute(name = "id", required = false)
 String id;
 
+@Column
 @Text(required = false)
 String content;
 

http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/bd59537b/app/src/main/java/org/apache/taverna/mobile/data/model/Type.java
--
diff --git a/app/src/main/java/org/apache/taverna/mobile/data/model/Type.java 
b/app/src/main/java/org/apache/taverna/mobile/data/model/Type.java
index a84a3c3..0137c08 100644
--- a/app/src/main/java/org/apache/taverna/mobile/data/model/Type.java
+++ b/app/src/main/java/org/apache/taverna/mobile/data/model/Type.java
@@ -23,6 +23,7 @@ import com.raizlabs.android.dbflow.annotation.ModelContainer;
 import com.raizlabs.android.dbflow.annotation.PrimaryKey;
 import com.raizlabs.android.dbflow.annotation.Table;
 
+import org.apache.taverna.mobile.data.local.TavernaBaseModel;
 import org.apache.taverna.mobile.data.local.TavernaDatabase;
 import org.simpleframework.xml.Attribute;
 import org.simpleframework.xml.Root;
@@ -34,7 +35,7 @@ import android.os.Parcelable;
 @Table(database = TavernaDatabase.class)
 @ModelContainer
 @Root(name = "type")
-public class Type implements Parcelable {
+public class Type extends TavernaBaseModel implements Parcelable {
 
 @Column
 @Attribute(name = "resource", required = false)

http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/bd59537b/app/src/main/java/org/apache/taverna/mobile/data/model/Uploader.java
--
diff --git 
a/app/src/main/java/org/apache/taverna/mobile/data/model/Uploader.java 
b/app/src/main/java/org/apache/taverna/mobile/data/model/Uploader.java
index b562cb5..f1fc3be 100644
--- a/app/src/main/java/org/apache/taverna/mobile/data/model/Uploader.java
+++ b/app/src/main/java/org/apache/taverna/mobile/data/model/Uploader.java
@@ -23,6 +23,7 @@ import com.raizlabs.android.dbflow.annotation.ModelContainer;
 import com.raizlabs.android.dbflow.annotation.PrimaryKey;
 import com.raizlabs.android.dbflow.annotation.Table;
 
+import org.apache.taverna.mobile.data.local.TavernaBaseModel;
 import org.apache.taverna.mobile.data.local.TavernaDatabase;
 import org.simpleframework.xml.Attribute;
 import org.simpleframework.xml.Root;
@@ -34,7 +35,7 @@ import android.os.Parcelable;
 @Table(database = TavernaDatabase.class)
 @ModelContainer
 @Root(name = "uploader"

[22/50] incubator-taverna-mobile git commit: remove typo error

[ianwdunlop]

remove typo error


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/59ba5d28
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/59ba5d28
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/59ba5d28

Branch: refs/heads/master
Commit: 59ba5d281bceadc7c7ebff6db4fef47163b661b9
Parents: 087ea56
Author: Sagar 
Authored: Sat Jul 2 00:11:30 2016 +0530
Committer: Sagar 
Committed: Sat Jul 2 00:11:30 2016 +0530

--
 .../main/java/org/apache/taverna/mobile/data/DataManager.java| 4 ++--
 .../java/org/apache/taverna/mobile/data/remote/APIEndPoint.java  | 2 +-
 .../org/apache/taverna/mobile/data/remote/TavernaService.java| 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/59ba5d28/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 4651d16..6d8982f 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
@@ -79,8 +79,8 @@ public class DataManager {
  * @return Detail of  Licence
  */
 
-public Observable getLicenceDetail(String id, Map 
options) {
-return mBaseApiManager.getTavernaApi().getLicenceDetail(id, options);
+public Observable getLicenseDetail(String id, Map 
options) {
+return mBaseApiManager.getTavernaApi().getLicenseDetail(id, options);
 }
 
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/59ba5d28/app/src/main/java/org/apache/taverna/mobile/data/remote/APIEndPoint.java
--
diff --git 
a/app/src/main/java/org/apache/taverna/mobile/data/remote/APIEndPoint.java 
b/app/src/main/java/org/apache/taverna/mobile/data/remote/APIEndPoint.java
index 9960aa9..4dce961 100644
--- a/app/src/main/java/org/apache/taverna/mobile/data/remote/APIEndPoint.java
+++ b/app/src/main/java/org/apache/taverna/mobile/data/remote/APIEndPoint.java
@@ -27,6 +27,6 @@ public class APIEndPoint {
 public static final String ALL_WORKFLOW = "workflows.xml";
 public static final String WORKFLOW = "workflow.xml";
 public static final String USER = "user.xml";
-public static final String LICENCE = "licence.xml";
+public static final String LICENSE = "license.xml";
 
 }

http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/59ba5d28/app/src/main/java/org/apache/taverna/mobile/data/remote/TavernaService.java
--
diff --git 
a/app/src/main/java/org/apache/taverna/mobile/data/remote/TavernaService.java 
b/app/src/main/java/org/apache/taverna/mobile/data/remote/TavernaService.java
index f3a7e4a..992f25c 100644
--- 
a/app/src/main/java/org/apache/taverna/mobile/data/remote/TavernaService.java
+++ 
b/app/src/main/java/org/apache/taverna/mobile/data/remote/TavernaService.java
@@ -52,8 +52,8 @@ public interface TavernaService {
 Observable getUserDetail(@Query("id") String id
 , @QueryMap Map options);
 
-@GET(APIEndPoint.LICENCE)
-Observable getLicenceDetail(@Query("id") String id
+@GET(APIEndPoint.LICENSE)
+Observable getLicenseDetail(@Query("id") String id
 , @QueryMap Map options);
 
 }
\ No newline at end of file

[13/50] incubator-taverna-mobile git commit: add toolbar with home back button

[ianwdunlop]

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 
Authored: Fri Jul 1 16:40:37 2016 +0530
Committer: Sagar 
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">
+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"/>
 
 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/l

[14/50] incubator-taverna-mobile git commit: add progressbar and error

[ianwdunlop]

add progressbar and error


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/fae70dc4
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/fae70dc4
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/fae70dc4

Branch: refs/heads/master
Commit: fae70dc4a79128037704f740022bf41d91ba8f15
Parents: f996f69
Author: Sagar 
Authored: Fri Jul 1 17:10:32 2016 +0530
Committer: Sagar 
Committed: Fri Jul 1 17:10:32 2016 +0530

--
 .../workflowdetail/WorkflowDetailFragment.java  |  51 +-
 .../workflowdetail/WorkflowDetailMvpView.java   |   2 +
 .../workflowdetail/WorkflowDetailPresenter.java |   2 +
 .../res/layout/fragment_detail_workflow.xml | 172 ++-
 4 files changed, 147 insertions(+), 80 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/fae70dc4/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 21230b6..c526a46 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
@@ -11,12 +11,17 @@ import org.apache.taverna.mobile.data.model.User;
 import org.apache.taverna.mobile.utils.ConnectionInfo;
 
 import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.design.widget.Snackbar;
 import android.support.v4.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.webkit.WebView;
 import android.widget.ImageView;
+import android.widget.ProgressBar;
+import android.widget.RelativeLayout;
+import android.widget.ScrollView;
 import android.widget.TextView;
 
 import butterknife.BindView;
@@ -47,6 +52,15 @@ public class WorkflowDetailFragment extends Fragment 
implements WorkflowDetailMv
 @BindView(R.id.tvDescription)
 WebView description;
 
+@BindView(R.id.progressBar)
+ProgressBar mProgressBar;
+
+@BindView(R.id.scrollView)
+ScrollView mScrollView;
+
+@BindView(R.id.rootLayout)
+RelativeLayout rootLayout;
+
 private DataManager dataManager;
 
 private WorkflowDetailPresenter mWorkflowDetailPresenter;
@@ -88,14 +102,31 @@ public class WorkflowDetailFragment extends Fragment 
implements WorkflowDetailMv
 ButterKnife.bind(this, rootView);
 
 mWorkflowDetailPresenter.attachView(this);
-mWorkflowDetailPresenter.loadWorkflowDetail(id);
 
 return rootView;
 }
 
 @Override
-public void showProgressbar(boolean b) {
+public void onActivityCreated(@Nullable Bundle savedInstanceState) {
+super.onActivityCreated(savedInstanceState);
+
+if(mConnectionInfo.isConnectingToInternet()) {
+
+mWorkflowDetailPresenter.loadWorkflowDetail(id);
+}else {
+
+showErrorSnackBar(getString(R.string.no_internet));
+}
+}
 
+@Override
+public void showProgressbar(boolean b) {
+if (b) {
+mProgressBar.setVisibility(View.VISIBLE);
+} else {
+mProgressBar.setVisibility(View.GONE);
+mScrollView.setVisibility(View.VISIBLE);
+}
 }
 
 @Override
@@ -128,6 +159,22 @@ public class WorkflowDetailFragment extends Fragment 
implements WorkflowDetailMv
 }
 
 @Override
+public void showErrorSnackBar(String error) {
+
+final Snackbar snackbar = Snackbar.make(rootLayout, error, Snackbar
+.LENGTH_INDEFINITE);
+snackbar.setAction("OK", new View.OnClickListener() {
+@Override
+public void onClick(View view) {
+snackbar.dismiss();
+}
+});
+
+snackbar.show();
+
+}
+
+@Override
 public void onDestroyView() {
 super.onDestroyView();
 mWorkflowDetailPresenter.detachView();

http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/fae70dc4/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailMvpView.java
--
diff --git 
a/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailMvpView.java
 
b/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailMvpView.java
index ed75e67..3d98952 100644
--- 
a/app/src/main/java/org/apache/taverna/mobile/ui/workflowde

[35/50] incubator-taverna-mobile git commit: remove checkstyle error

[ianwdunlop]

remove checkstyle error


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/e5ec7c35
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/e5ec7c35
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/e5ec7c35

Branch: refs/heads/master
Commit: e5ec7c35cd801adc708dd720e4372749a5e34d9b
Parents: fb62724
Author: Sagar 
Authored: Sun Jul 3 23:17:16 2016 +0530
Committer: Sagar 
Committed: Sun Jul 3 23:17:16 2016 +0530

--
 .../org/apache/taverna/mobile/data/local/TavernaDatabase.java| 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/e5ec7c35/app/src/main/java/org/apache/taverna/mobile/data/local/TavernaDatabase.java
--
diff --git 
a/app/src/main/java/org/apache/taverna/mobile/data/local/TavernaDatabase.java 
b/app/src/main/java/org/apache/taverna/mobile/data/local/TavernaDatabase.java
index adf10b8..f3e32ca 100644
--- 
a/app/src/main/java/org/apache/taverna/mobile/data/local/TavernaDatabase.java
+++ 
b/app/src/main/java/org/apache/taverna/mobile/data/local/TavernaDatabase.java
@@ -2,7 +2,9 @@ package org.apache.taverna.mobile.data.local;
 
 import com.raizlabs.android.dbflow.annotation.Database;
 
-@Database(name = TavernaDatabase.NAME, version = TavernaDatabase.VERSION, 
foreignKeysSupported = true)
+@Database(name = TavernaDatabase.NAME,
+version = TavernaDatabase.VERSION,
+foreignKeysSupported = true)
 public class TavernaDatabase {
 
 

[33/50] incubator-taverna-mobile git commit: stetho setup done

[ianwdunlop]

stetho setup done


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/1ca4100d
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/1ca4100d
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/1ca4100d

Branch: refs/heads/master
Commit: 1ca4100d792f0381100392ba8904e221bd2d5514
Parents: 49d1544
Author: Sagar 
Authored: Sun Jul 3 13:41:04 2016 +0530
Committer: Sagar 
Committed: Sun Jul 3 13:41:04 2016 +0530

--
 .../main/java/org/apache/taverna/mobile/TavernaApplication.java | 5 +
 .../apache/taverna/mobile/data/remote/TavernaOkHttpClient.java  | 4 
 2 files changed, 9 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/1ca4100d/app/src/main/java/org/apache/taverna/mobile/TavernaApplication.java
--
diff --git 
a/app/src/main/java/org/apache/taverna/mobile/TavernaApplication.java 
b/app/src/main/java/org/apache/taverna/mobile/TavernaApplication.java
index 8f545e0..0e37f40 100644
--- a/app/src/main/java/org/apache/taverna/mobile/TavernaApplication.java
+++ b/app/src/main/java/org/apache/taverna/mobile/TavernaApplication.java
@@ -1,6 +1,7 @@
 package org.apache.taverna.mobile;
 
 
+import com.facebook.stetho.Stetho;
 import com.raizlabs.android.dbflow.config.FlowConfig;
 import com.raizlabs.android.dbflow.config.FlowManager;
 
@@ -11,6 +12,10 @@ public class TavernaApplication extends Application{
 @Override
 public void onCreate() {
 super.onCreate();
+
 FlowManager.init(new FlowConfig.Builder(this).build());
+
+Stetho.initializeWithDefaults(this);
+
 }
 }

http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/1ca4100d/app/src/main/java/org/apache/taverna/mobile/data/remote/TavernaOkHttpClient.java
--
diff --git 
a/app/src/main/java/org/apache/taverna/mobile/data/remote/TavernaOkHttpClient.java
 
b/app/src/main/java/org/apache/taverna/mobile/data/remote/TavernaOkHttpClient.java
index d7b432d..f0650a5 100644
--- 
a/app/src/main/java/org/apache/taverna/mobile/data/remote/TavernaOkHttpClient.java
+++ 
b/app/src/main/java/org/apache/taverna/mobile/data/remote/TavernaOkHttpClient.java
@@ -18,6 +18,8 @@
  */
 package org.apache.taverna.mobile.data.remote;
 
+import com.facebook.stetho.okhttp3.StethoInterceptor;
+
 import okhttp3.OkHttpClient;
 import okhttp3.logging.HttpLoggingInterceptor;
 
@@ -34,6 +36,8 @@ public class TavernaOkHttpClient {
 
 //Interceptor :> Full Body Logger
 builder.addInterceptor(logger);
+
+builder.addNetworkInterceptor(new StethoInterceptor());
 return builder.build();
 
 }

[26/50] incubator-taverna-mobile git commit: add background color to workflow list layout

[ianwdunlop]

add background color to workflow list layout


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/fa136ed9
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/fa136ed9
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/fa136ed9

Branch: refs/heads/master
Commit: fa136ed90c40175786ebbed26095becbe5c3661a
Parents: 73e86f9
Author: Sagar 
Authored: Sat Jul 2 18:31:04 2016 +0530
Committer: Sagar 
Committed: Sat Jul 2 18:31:04 2016 +0530

--
 app/src/main/res/layout/fragment_dashboard.xml | 3 ++-
 app/src/main/res/values/colors.xml | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/fa136ed9/app/src/main/res/layout/fragment_dashboard.xml
--
diff --git a/app/src/main/res/layout/fragment_dashboard.xml 
b/app/src/main/res/layout/fragment_dashboard.xml
index 85608e2..3cd17a4 100644
--- a/app/src/main/res/layout/fragment_dashboard.xml
+++ b/app/src/main/res/layout/fragment_dashboard.xml
@@ -18,7 +18,8 @@
 http://schemas.android.com/apk/res/android";
 android:layout_width="match_parent"
-android:layout_height="match_parent">
+android:layout_height="match_parent"
+android:background="@color/grey_background">
 
 
 http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/fa136ed9/app/src/main/res/values/colors.xml
--
diff --git a/app/src/main/res/values/colors.xml 
b/app/src/main/res/values/colors.xml
index 93f5b10..718bedb 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -21,6 +21,6 @@
#FF4081
#FFF5F5F5
#e0e0e0
-   #882196F3
+   #EE2196F3
#e0e0e0
 
\ No newline at end of file

[50/50] incubator-taverna-mobile git commit: Merge remote-tracking branch 'origin/Dashboard' into Dashboard

[ianwdunlop]

Merge remote-tracking branch 'origin/Dashboard' into Dashboard


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/fb8e0981
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/fb8e0981
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/fb8e0981

Branch: refs/heads/master
Commit: fb8e0981b9b778d6d64b1064b5d553d5649c45b4
Parents: b4f3316 eaea8b7
Author: Sagar 
Authored: Tue Jul 5 17:50:39 2016 +0530
Committer: Sagar 
Committed: Tue Jul 5 17:50:39 2016 +0530

--
 app/build.gradle|   1 -
 .../apache/taverna/mobile/data/local/DBHelper.java  |   5 +
 .../apache/taverna/mobile/data/model/Workflow.java  |   2 +-
 .../ui/workflowdetail/WorkflowDetailFragment.java   |   9 -
 .../ui/workflowdetail/WorkflowDetailPresenter.java  |  10 --
 .../main/res/drawable-hdpi/ic_star_black_24dp.png   | Bin 0 -> 369 bytes
 .../res/drawable-hdpi/ic_star_border_black_24dp.png | Bin 0 -> 500 bytes
 .../main/res/drawable-mdpi/ic_star_black_24dp.png   | Bin 0 -> 263 bytes
 .../res/drawable-mdpi/ic_star_border_black_24dp.png | Bin 0 -> 332 bytes
 .../main/res/drawable-xhdpi/ic_star_black_24dp.png  | Bin 0 -> 467 bytes
 .../drawable-xhdpi/ic_star_border_black_24dp.png| Bin 0 -> 674 bytes
 .../main/res/drawable-xxhdpi/ic_star_black_24dp.png | Bin 0 -> 668 bytes
 .../drawable-xxhdpi/ic_star_border_black_24dp.png   | Bin 0 -> 971 bytes
 .../res/drawable-xxxhdpi/ic_star_black_24dp.png | Bin 0 -> 887 bytes
 .../drawable-xxxhdpi/ic_star_border_black_24dp.png  | Bin 0 -> 1301 bytes
 app/src/main/res/drawable/ic_star_black_24dp.xml|   9 -
 .../main/res/drawable/ic_star_border_black_24dp.xml |   9 -
 17 files changed, 10 insertions(+), 35 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/fb8e0981/app/src/main/java/org/apache/taverna/mobile/data/local/DBHelper.java
--

http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/fb8e0981/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailFragment.java
--

http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/fb8e0981/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailPresenter.java
--

[24/50] incubator-taverna-mobile git commit: add licence working to fragment using presenter and MvpView

[ianwdunlop]

add licence working to fragment using presenter and MvpView


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/608a61cf
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/608a61cf
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/608a61cf

Branch: refs/heads/master
Commit: 608a61cf761fbec6a4e3edd9c17d75c880e483e6
Parents: 0e59d8e
Author: Sagar 
Authored: Sat Jul 2 00:34:02 2016 +0530
Committer: Sagar 
Committed: Sat Jul 2 00:34:02 2016 +0530

--
 .../workflowdetail/WorkflowDetailFragment.java  | 61 +++-
 .../workflowdetail/WorkflowDetailMvpView.java   |  3 +
 .../workflowdetail/WorkflowDetailPresenter.java | 34 +++
 3 files changed, 96 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/608a61cf/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 22b96ea..bcd4f57 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
@@ -7,6 +7,7 @@ import com.bumptech.glide.load.engine.DiskCacheStrategy;
 import org.apache.taverna.mobile.R;
 import org.apache.taverna.mobile.data.DataManager;
 import org.apache.taverna.mobile.data.model.DetailWorkflow;
+import org.apache.taverna.mobile.data.model.License;
 import org.apache.taverna.mobile.data.model.User;
 import org.apache.taverna.mobile.utils.ConnectionInfo;
 
@@ -14,6 +15,7 @@ import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.design.widget.Snackbar;
 import android.support.v4.app.Fragment;
+import android.support.v7.app.AlertDialog;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -21,6 +23,7 @@ import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.webkit.WebView;
+import android.widget.Button;
 import android.widget.ImageView;
 import android.widget.ProgressBar;
 import android.widget.RelativeLayout;
@@ -64,6 +67,8 @@ public class WorkflowDetailFragment extends Fragment 
implements WorkflowDetailMv
 @BindView(R.id.rootLayout)
 RelativeLayout rootLayout;
 
+private AlertDialog alertDialog;
+
 private DataManager dataManager;
 
 private WorkflowDetailPresenter mWorkflowDetailPresenter;
@@ -74,6 +79,8 @@ public class WorkflowDetailFragment extends Fragment 
implements WorkflowDetailMv
 
 private String id;
 
+private String licenceId = null;
+
 public static WorkflowDetailFragment newInstance(String id) {
 
 Bundle args = new Bundle();
@@ -134,9 +141,20 @@ public class WorkflowDetailFragment extends Fragment 
implements WorkflowDetailMv
 
 @Override
 public boolean onOptionsItemSelected(MenuItem item) {
-switch (item.getItemId()){
+switch (item.getItemId()) {
 case R.id.licence:
 
+if (licenceId == null) {
+
+showErrorSnackBar("Please wait");
+} else if (licenceId.isEmpty()) {
+
+showErrorSnackBar("No Licence Found");
+} else {
+
+mWorkflowDetailPresenter.loadLicenseDetail(licenceId);
+}
+
 return true;
 }
 
@@ -158,7 +176,8 @@ public class WorkflowDetailFragment extends Fragment 
implements WorkflowDetailMv
 public void showWorkflowDetail(DetailWorkflow detailWorkflow) {
 
 uploaderName.setText(detailWorkflow.getUploader().getContent());
-date.setText(detailWorkflow.getUpdatedAt());
+date.setText(detailWorkflow.getUpdatedAt()
+.substring(0, detailWorkflow.getUpdatedAt().indexOf(' ')));
 type.setText(detailWorkflow.getType().getContent());
 title.setText(detailWorkflow.getTitle());
 description.loadData(detailWorkflow.getDescription(), "text/html", 
"utf-8");
@@ -169,6 +188,13 @@ public class WorkflowDetailFragment extends Fragment 
implements WorkflowDetailMv
 .placeholder(R.drawable.placeholder)
 .error(R.drawable.placeholder)
 .into(workflowImage);
+
+if (detailWorkflow.getLicenseType().getId() == null) {
+licenceId = "";
+} else {
+licenceId = detailWorkflow.getLicenseType().getId();
+}
+
 }
 
 @Override
@@ -200,6 +226

[19/50] incubator-taverna-mobile git commit: add License java bean

[ianwdunlop]

add License java bean


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/61c3b0eb
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/61c3b0eb
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/61c3b0eb

Branch: refs/heads/master
Commit: 61c3b0eb77bec5006f77c9b92312c4136c490abf
Parents: 2b416fe
Author: Sagar 
Authored: Fri Jul 1 23:48:56 2016 +0530
Committer: Sagar 
Committed: Fri Jul 1 23:48:56 2016 +0530

--
 .../taverna/mobile/data/model/License.java  | 156 +++
 1 file changed, 156 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/61c3b0eb/app/src/main/java/org/apache/taverna/mobile/data/model/License.java
--
diff --git 
a/app/src/main/java/org/apache/taverna/mobile/data/model/License.java 
b/app/src/main/java/org/apache/taverna/mobile/data/model/License.java
new file mode 100644
index 000..279d681
--- /dev/null
+++ b/app/src/main/java/org/apache/taverna/mobile/data/model/License.java
@@ -0,0 +1,156 @@
+package org.apache.taverna.mobile.data.model;
+
+
+import org.simpleframework.xml.Attribute;
+import org.simpleframework.xml.Element;
+
+import android.os.Parcel;
+import android.os.Parcelable;
+
+public class License implements Parcelable {
+
+@Attribute(name = "resource", required = false)
+private String resource;
+
+@Attribute(name = "uri", required = false)
+private String uri;
+
+@Attribute(name = "id", required = false)
+private String id;
+
+@Element(name = "id", required = false)
+private String elementId;
+
+@Element(name = "unique-name", required = false)
+private String uniqueName;
+
+@Element(name = "title", required = false)
+private String title;
+
+@Element(name = "description", required = false)
+private String description;
+
+@Element(name = "url", required = false)
+private String url;
+
+@Element(name = "created-at", required = false)
+private String createdAt;
+
+public String getCreatedAt() {
+return createdAt;
+}
+
+public void setCreatedAt(String createdAt) {
+this.createdAt = createdAt;
+}
+
+public String getDescription() {
+return description;
+}
+
+public void setDescription(String description) {
+this.description = description;
+}
+
+public String getElementId() {
+return elementId;
+}
+
+public void setElementId(String elementId) {
+this.elementId = elementId;
+}
+
+public String getId() {
+return id;
+}
+
+public void setId(String id) {
+this.id = id;
+}
+
+public String getResource() {
+return resource;
+}
+
+public void setResource(String resource) {
+this.resource = resource;
+}
+
+public String getTitle() {
+return title;
+}
+
+public void setTitle(String title) {
+this.title = title;
+}
+
+public String getUniqueName() {
+return uniqueName;
+}
+
+public void setUniqueName(String uniqueName) {
+this.uniqueName = uniqueName;
+}
+
+public String getUri() {
+return uri;
+}
+
+public void setUri(String uri) {
+this.uri = uri;
+}
+
+public String getUrl() {
+return url;
+}
+
+public void setUrl(String url) {
+this.url = url;
+}
+
+
+@Override
+public int describeContents() {
+return 0;
+}
+
+@Override
+public void writeToParcel(Parcel dest, int flags) {
+dest.writeString(this.resource);
+dest.writeString(this.uri);
+dest.writeString(this.id);
+dest.writeString(this.elementId);
+dest.writeString(this.uniqueName);
+dest.writeString(this.title);
+dest.writeString(this.description);
+dest.writeString(this.url);
+dest.writeString(this.createdAt);
+}
+
+public License() {
+}
+
+protected License(Parcel in) {
+this.resource = in.readString();
+this.uri = in.readString();
+this.id = in.readString();
+this.elementId = in.readString();
+this.uniqueName = in.readString();
+this.title = in.readString();
+this.description = in.readString();
+this.url = in.readString();
+this.createdAt = in.readString();
+}
+
+public static final Parcelable.Creator CREATOR = new 
Parcelable.Creator() {
+@Override
+public License createFromParcel(Parcel source) {
+return new License(source);
+}
+
+@Override
+public License[] newArray(int size) {
+return new License[size];
+}

[49/50] incubator-taverna-mobile git commit: add ASF header

[ianwdunlop]

add ASF header


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/b4f3316e
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/b4f3316e
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/b4f3316e

Branch: refs/heads/master
Commit: b4f3316ec72119456cdddf20a38baf59e800d509
Parents: b346c02
Author: Sagar 
Authored: Tue Jul 5 17:47:26 2016 +0530
Committer: Sagar 
Committed: Tue Jul 5 17:47:26 2016 +0530

--
 .../apache/taverna/mobile/TavernaApplication.java | 18 ++
 .../taverna/mobile/data/local/DBHelper.java   | 18 ++
 .../mobile/data/local/TavernaBaseModel.java   | 18 ++
 .../mobile/data/local/TavernaDatabase.java| 18 ++
 .../apache/taverna/mobile/data/model/Avatar.java  | 18 ++
 .../apache/taverna/mobile/data/model/License.java | 18 ++
 .../apache/taverna/mobile/data/model/User.java| 18 ++
 .../ui/workflowdetail/WorkflowDetailActivity.java | 18 ++
 .../ui/workflowdetail/WorkflowDetailFragment.java | 18 ++
 .../ui/workflowdetail/WorkflowDetailMvpView.java  | 18 ++
 .../workflowdetail/WorkflowDetailPresenter.java   | 18 ++
 .../main/res/drawable/background_fav_button.xml   | 16 
 .../main/res/layout/activity_detail_workflow.xml  | 16 
 .../res/layout/dialog_licence_detail_workflow.xml | 16 
 .../main/res/layout/fragment_detail_workflow.xml  | 16 
 app/src/main/res/menu/menu_workflow_detail.xml| 17 +
 16 files changed, 279 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/b4f3316e/app/src/main/java/org/apache/taverna/mobile/TavernaApplication.java
--
diff --git 
a/app/src/main/java/org/apache/taverna/mobile/TavernaApplication.java 
b/app/src/main/java/org/apache/taverna/mobile/TavernaApplication.java
index 096addc..d727718 100644
--- a/app/src/main/java/org/apache/taverna/mobile/TavernaApplication.java
+++ b/app/src/main/java/org/apache/taverna/mobile/TavernaApplication.java
@@ -1,3 +1,21 @@
+/*
+ * 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.
+ */
 package org.apache.taverna.mobile;
 
 

http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/b4f3316e/app/src/main/java/org/apache/taverna/mobile/data/local/DBHelper.java
--
diff --git 
a/app/src/main/java/org/apache/taverna/mobile/data/local/DBHelper.java 
b/app/src/main/java/org/apache/taverna/mobile/data/local/DBHelper.java
index 3570f03..55c975d 100644
--- a/app/src/main/java/org/apache/taverna/mobile/data/local/DBHelper.java
+++ b/app/src/main/java/org/apache/taverna/mobile/data/local/DBHelper.java
@@ -1,3 +1,21 @@
+/*
+ * 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.
+ */
 package org.apache.taverna.mobile.data.local;
 
 

http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/b4f3316e/app/src/main/java/org/apache/taverna/mobile/data/local/TavernaBaseModel.java
--

[3/3] incubator-taverna-mobile git commit: add suggestion

[ianwdunlop]

add suggestion


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/d73dc200
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/d73dc200
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/d73dc200

Branch: refs/heads/master
Commit: d73dc2005d0efba59094101e9b50cea558ea7ff9
Parents: a84be44
Author: Sagar 
Authored: Tue Jul 5 23:41:53 2016 +0530
Committer: Sagar 
Committed: Tue Jul 5 23:41:53 2016 +0530

--
 .../taverna/mobile/ui/workflow/WorkflowFragment.java | 15 +--
 app/src/main/res/layout/fragment_dashboard.xml   |  2 +-
 2 files changed, 10 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/d73dc200/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 074ef9e..f7e77d9 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
@@ -54,7 +54,7 @@ public class WorkflowFragment extends Fragment implements 
WorkflowMvpView,
 RecyclerItemClickListner.OnItemClickListener {
 public final String LOG_TAG = getClass().getSimpleName();
 
-@BindView(R.id.rvDashboard)
+@BindView(R.id.rv_workflows)
 RecyclerView mRecyclerView;
 
 @BindView(R.id.progress_circular)
@@ -129,11 +129,14 @@ public class WorkflowFragment extends Fragment implements 
WorkflowMvpView,
 @Override
 public void onRefresh() {
 if (mConnectionInfo.isConnectingToInternet()) {
-if (mSwipeRefresh.isRefreshing()) {
-mPageNumber = 1;
-mWorkflowPresenter.loadAllWorkflow(mPageNumber);
-Log.d(LOG_TAG, "Swipe Refresh");
-}
+
+mPageNumber = 1;
+mWorkflowPresenter.loadAllWorkflow(mPageNumber);
+
+mSwipeRefresh.setRefreshing(true);
+
+Log.d(LOG_TAG, "Swipe Refresh");
+
 } else {
 Log.d(LOG_TAG, "NO Internet Connection");
 showErrorSnackBar();

http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/d73dc200/app/src/main/res/layout/fragment_dashboard.xml
--
diff --git a/app/src/main/res/layout/fragment_dashboard.xml 
b/app/src/main/res/layout/fragment_dashboard.xml
index f3b691a..06e4781 100644
--- a/app/src/main/res/layout/fragment_dashboard.xml
+++ b/app/src/main/res/layout/fragment_dashboard.xml
@@ -27,7 +27,7 @@
 android:layout_height="match_parent">
 
 

[2/3] incubator-taverna-mobile git commit: add swipe refresh layout logic

[ianwdunlop]

add swipe refresh layout logic


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/a84be443
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/a84be443
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/a84be443

Branch: refs/heads/master
Commit: a84be443795b3b8f95983ad27c5c02e43c9a52e4
Parents: 78afb47
Author: Sagar 
Authored: Tue Jul 5 23:07:32 2016 +0530
Committer: Sagar 
Committed: Tue Jul 5 23:07:32 2016 +0530

--
 .../mobile/ui/workflow/WorkflowFragment.java| 46 
 .../mobile/ui/workflow/WorkflowPresenter.java   |  3 --
 2 files changed, 46 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/a84be443/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 be433d7..074ef9e 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
@@ -28,10 +28,13 @@ import 
org.apache.taverna.mobile.ui.adapter.RecyclerItemClickListner;
 import org.apache.taverna.mobile.ui.adapter.WorkflowAdapter;
 import org.apache.taverna.mobile.ui.workflowdetail.WorkflowDetailActivity;
 import org.apache.taverna.mobile.utils.ConnectionInfo;
+import org.apache.taverna.mobile.utils.ScrollChildSwipeRefreshLayout;
 
 import android.content.Intent;
 import android.os.Bundle;
+import android.support.design.widget.Snackbar;
 import android.support.v4.app.Fragment;
+import android.support.v4.widget.SwipeRefreshLayout;
 import android.support.v7.widget.DefaultItemAnimator;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
@@ -57,6 +60,9 @@ public class WorkflowFragment extends Fragment implements 
WorkflowMvpView,
 @BindView(R.id.progress_circular)
 ProgressBar mProgressBar;
 
+@BindView(R.id.swipe_refresh)
+ScrollChildSwipeRefreshLayout mSwipeRefresh;
+
 private DataManager dataManager;
 
 private WorkflowPresenter mWorkflowPresenter;
@@ -96,6 +102,7 @@ public class WorkflowFragment extends Fragment implements 
WorkflowMvpView,
 mRecyclerView.setAdapter(mWorkflowAdapter);
 mRecyclerView.addOnItemTouchListener(new 
RecyclerItemClickListner(getActivity(), this));
 
+showProgressbar(true);
 mWorkflowPresenter.loadAllWorkflow(mPageNumber);
 
 mRecyclerView.addOnScrollListener(new 
EndlessRecyclerOnScrollListener(layoutManager) {
@@ -116,6 +123,29 @@ public class WorkflowFragment extends Fragment implements 
WorkflowMvpView,
 }
 });
 
+mSwipeRefresh.setColorSchemeResources(R.color.colorAccent, 
R.color.colorAccent, R.color
+.colorPrimary);
+mSwipeRefresh.setOnRefreshListener(new 
SwipeRefreshLayout.OnRefreshListener() {
+@Override
+public void onRefresh() {
+if (mConnectionInfo.isConnectingToInternet()) {
+if (mSwipeRefresh.isRefreshing()) {
+mPageNumber = 1;
+mWorkflowPresenter.loadAllWorkflow(mPageNumber);
+Log.d(LOG_TAG, "Swipe Refresh");
+}
+} else {
+Log.d(LOG_TAG, "NO Internet Connection");
+showErrorSnackBar();
+if (mSwipeRefresh.isRefreshing()) {
+mSwipeRefresh.setRefreshing(false);
+}
+}
+
+}
+});
+
+
 return rootView;
 }
 
@@ -134,10 +164,26 @@ public class WorkflowFragment extends Fragment implements 
WorkflowMvpView,
 @Override
 public void showErrorSnackBar() {
 
+final Snackbar snackbar = Snackbar.make(mRecyclerView, "NO Internet 
Connection", Snackbar
+.LENGTH_INDEFINITE);
+snackbar.setAction("OK", new View.OnClickListener() {
+@Override
+public void onClick(View view) {
+snackbar.dismiss();
+}
+});
+
+snackbar.show();
 }
 
 @Override
 public void showWorkflows(Workflows workflows) {
+
+if (mSwipeRefresh.isRefreshing()) {
+mSwipeRefresh.setRefreshing(false);
+mWorkflowList.clear();
+}
+
 mWorkflowList.addAll(workflows.getWorkflowList());
 mWorkflowAdapter.notifyDataSetChanged();
 }

http://git-wip-us.apache.org/repos/asf/incubato

[1/3] incubator-taverna-mobile git commit: add swipe refresh in layout

[ianwdunlop]

Repository: incubator-taverna-mobile
Updated Branches:
  refs/heads/master fb8e0981b -> d73dc2005


add swipe refresh in layout


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/78afb477
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/78afb477
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/78afb477

Branch: refs/heads/master
Commit: 78afb477511fc974d46ac7d141825030f389a36f
Parents: fb8e098
Author: Sagar 
Authored: Tue Jul 5 23:07:10 2016 +0530
Committer: Sagar 
Committed: Tue Jul 5 23:07:10 2016 +0530

--
 app/src/main/res/layout/fragment_dashboard.xml | 18 +++---
 1 file changed, 11 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/78afb477/app/src/main/res/layout/fragment_dashboard.xml
--
diff --git a/app/src/main/res/layout/fragment_dashboard.xml 
b/app/src/main/res/layout/fragment_dashboard.xml
index 3cd17a4..f3b691a 100644
--- a/app/src/main/res/layout/fragment_dashboard.xml
+++ b/app/src/main/res/layout/fragment_dashboard.xml
@@ -21,15 +21,19 @@
 android:layout_height="match_parent"
 android:background="@color/grey_background">
 
-
-
+android:layout_height="match_parent">
 
+
+
 
 

[04/21] incubator-taverna-mobile git commit: add read method in DB layer to get favourite workflow

[ianwdunlop]

add read method in DB layer to get favourite workflow


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/c4698a80
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/c4698a80
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/c4698a80

Branch: refs/heads/master
Commit: c4698a8072df5860e085b77932e477cbddaea89e
Parents: 1e66e3b
Author: Sagar 
Authored: Sat Jul 9 23:25:54 2016 +0530
Committer: Sagar 
Committed: Sat Jul 9 23:25:54 2016 +0530

--
 .../taverna/mobile/data/local/DBHelper.java | 20 
 1 file changed, 20 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/c4698a80/app/src/main/java/org/apache/taverna/mobile/data/local/DBHelper.java
--
diff --git 
a/app/src/main/java/org/apache/taverna/mobile/data/local/DBHelper.java 
b/app/src/main/java/org/apache/taverna/mobile/data/local/DBHelper.java
index ee27a3f..f81f88e 100644
--- a/app/src/main/java/org/apache/taverna/mobile/data/local/DBHelper.java
+++ b/app/src/main/java/org/apache/taverna/mobile/data/local/DBHelper.java
@@ -27,6 +27,8 @@ import org.apache.taverna.mobile.data.model.Workflows;
 
 import android.support.annotation.Nullable;
 
+import java.util.List;
+
 import rx.Observable;
 import rx.Subscriber;
 
@@ -184,6 +186,24 @@ public class DBHelper {
 return false;
 }
 
+public Observable> getFavouriteWorkflow() {
+return Observable.create(new Observable.OnSubscribe>() {
+@Override
+public void call(Subscriber> subscriber) {
+if (subscriber.isUnsubscribed()) return;
+List workflows = SQLite.select()
+.from(Workflow.class)
+.where(Workflow_Table.favourite.eq(true))
+.queryList();
+
+subscriber.onNext(workflows);
+subscriber.onCompleted();
+
+}
+});
+
+}
+
 
 }
 

[10/21] incubator-taverna-mobile git commit: add Favourite Workflow List UI

[ianwdunlop]

add Favourite Workflow List UI


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/7c00a863
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/7c00a863
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/7c00a863

Branch: refs/heads/master
Commit: 7c00a863f9dcd5038c3fc26172b1bfb29e9c881e
Parents: 1b78a0f
Author: Sagar 
Authored: Sun Jul 10 00:29:51 2016 +0530
Committer: Sagar 
Committed: Sun Jul 10 00:29:51 2016 +0530

--
 .../FavouriteWorkflowsFragment.java | 109 +++
 .../layout/fragment_favourite_workflow_list.xml |   2 +-
 2 files changed, 110 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/7c00a863/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflow/FavouriteWorkflowsFragment.java
--
diff --git 
a/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflow/FavouriteWorkflowsFragment.java
 
b/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflow/FavouriteWorkflowsFragment.java
new file mode 100644
index 000..0af0101
--- /dev/null
+++ 
b/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflow/FavouriteWorkflowsFragment.java
@@ -0,0 +1,109 @@
+package org.apache.taverna.mobile.ui.favouriteworkflow;
+
+
+import org.apache.taverna.mobile.R;
+import org.apache.taverna.mobile.data.DataManager;
+import org.apache.taverna.mobile.data.model.Workflow;
+import org.apache.taverna.mobile.ui.adapter.FavouriteWorkflowsAdapter;
+
+import android.os.Bundle;
+import android.support.design.widget.Snackbar;
+import android.support.v4.app.Fragment;
+import android.support.v7.widget.DefaultItemAnimator;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ProgressBar;
+
+import java.util.List;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+
+public class FavouriteWorkflowsFragment extends Fragment implements 
FavouriteWorkflowsMvpView {
+
+public final String LOG_TAG = getClass().getSimpleName();
+
+@BindView(R.id.rv_fav_workflows)
+RecyclerView mRecyclerView;
+
+@BindView(R.id.progress_circular)
+ProgressBar mProgressBar;
+
+private DataManager dataManager;
+
+private FavouriteWorkflowsPresenter mFavouriteWorkflowsPresenter;
+
+private FavouriteWorkflowsAdapter mFavouriteWorkflowsAdapter;
+
+
+@Override
+public void onCreate(Bundle savedInstanceState) {
+super.onCreate(savedInstanceState);
+
+dataManager = new DataManager();
+
+mFavouriteWorkflowsPresenter = new 
FavouriteWorkflowsPresenter(dataManager);
+}
+
+@Override
+public View onCreateView(LayoutInflater inflater, ViewGroup container, 
Bundle
+savedInstanceState) {
+
+View rootView = 
inflater.inflate(R.layout.fragment_favourite_workflow_list, container, false);
+
+ButterKnife.bind(this, rootView);
+
+mFavouriteWorkflowsPresenter.attachView(this);
+
+final LinearLayoutManager layoutManager = new 
LinearLayoutManager(getActivity());
+
+mRecyclerView.setLayoutManager(layoutManager);
+mRecyclerView.setItemAnimator(new DefaultItemAnimator());
+mRecyclerView.hasFixedSize();
+
+showProgressbar(true);
+mFavouriteWorkflowsPresenter.loadAllWorkflow();
+
+return rootView;
+}
+
+
+@Override
+public void showProgressbar(boolean b) {
+if (b) {
+mProgressBar.setVisibility(View.VISIBLE);
+} else {
+mProgressBar.setVisibility(View.GONE);
+mRecyclerView.setVisibility(View.VISIBLE);
+}
+}
+
+@Override
+public void showErrorSnackBar() {
+final Snackbar snackbar = Snackbar.make(mRecyclerView, "Error 
occurred.Please try after some time", Snackbar
+.LENGTH_INDEFINITE);
+snackbar.setAction("OK", new View.OnClickListener() {
+@Override
+public void onClick(View view) {
+snackbar.dismiss();
+}
+});
+
+snackbar.show();
+}
+
+@Override
+public void showWorkflows(List workflowList) {
+
+mFavouriteWorkflowsAdapter = new 
FavouriteWorkflowsAdapter(workflowList, getContext());
+mRecyclerView.setAdapter(mFavouriteWorkflowsAdapter);
+}
+
+@Override
+public void showNoWorkflowError() {
+
+}
+}

http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/7c00a863/app/src/main/res/layout/fragment_favourite_workflow_list.xml

[17/21] incubator-taverna-mobile git commit: replace Fragment Transaction by fragment transaction function in util

[ianwdunlop]

replace Fragment Transaction by  fragment transaction function in util


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/8bc9a980
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/8bc9a980
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/8bc9a980

Branch: refs/heads/master
Commit: 8bc9a9802f18473187d8e3b24a4d7514114d5589
Parents: bafa7a7
Author: Sagar 
Authored: Tue Jul 12 19:38:02 2016 +0530
Committer: Sagar 
Committed: Tue Jul 12 19:38:02 2016 +0530

--
 .../activities/DashboardMainActivity.java   | 40 ++--
 1 file changed, 21 insertions(+), 19 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/8bc9a980/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 e79a0f5..75cff20 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,6 +29,7 @@ import org.apache.taverna.mobile.R;
 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.ActivityUtils;
 import org.apache.taverna.mobile.utils.WorkflowOpen;
 
 import android.app.Dialog;
@@ -122,17 +123,17 @@ public class DashboardMainActivity extends 
AppCompatActivity {
 public boolean onNavigationItemSelected(MenuItem menuItem) 
{
 
 
-FragmentManager fragmentManager = 
getSupportFragmentManager();
 Fragment fragment;
 
 switch (menuItem.getItemId()) {
 case R.id.nav_workflows:
 
 fragment = new WorkflowFragment();
-fragmentManager.beginTransaction()
-.replace(R.id.frame_container, 
fragment)
-
.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_CLOSE)
-.commit();
+ActivityUtils
+.addFragmentToActivity(
+getSupportFragmentManager(),
+fragment,
+R.id.frame_container);
 
 menuItem.setChecked(true);
 mDrawerLayout.closeDrawers();
@@ -141,11 +142,11 @@ public class DashboardMainActivity extends 
AppCompatActivity {
 case R.id.nav_favourite_workflow:
 
 fragment = new FavouriteWorkflowsFragment();
-fragmentManager.beginTransaction()
-.replace(R.id.frame_container, 
fragment)
-
.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_CLOSE)
-.commit();
-
+ActivityUtils
+.addFragmentToActivity(
+getSupportFragmentManager(),
+fragment,
+R.id.frame_container);
 menuItem.setChecked(true);
 mDrawerLayout.closeDrawers();
 return true;
@@ -153,10 +154,11 @@ public class DashboardMainActivity extends 
AppCompatActivity {
 case R.id.nav_announcement:
 
 fragment = new AnnouncementFragment();
-fragmentManager.beginTransaction()
-.replace(R.id.frame_container, 
fragment)
-
.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_CLOSE)
-.commit();
+ActivityUtils
+.addFragmentToActivity(
+getSupportFragmentManager(),
+fragment,
+

[01/21] incubator-taverna-mobile git commit: reposition favourite workflows to navigation drawer menu

[ianwdunlop]

Repository: incubator-taverna-mobile
Updated Branches:
  refs/heads/master d73dc2005 -> a90f32eb1


reposition favourite workflows  to navigation drawer menu


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/77b4704e
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/77b4704e
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/77b4704e

Branch: refs/heads/master
Commit: 77b4704e5ab8a9ec0dc0c7e6441c378e0bc10fb9
Parents: d73dc20
Author: Sagar 
Authored: Fri Jul 8 22:35:37 2016 +0530
Committer: Sagar 
Committed: Fri Jul 8 22:35:37 2016 +0530

--
 .../mobile/activities/DashboardMainActivity.java | 19 +--
 app/src/main/res/menu/drawer_view.xml|  8 +++-
 2 files changed, 24 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/77b4704e/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 6ec84d8..ad31a28 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,8 +26,10 @@ 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.workflow.WorkflowFragment;
 import org.apache.taverna.mobile.utils.WorkflowOpen;
 
 import android.app.Dialog;
@@ -116,9 +118,9 @@ public class DashboardMainActivity extends 
AppCompatActivity {
 Fragment fragment;
 
 switch (menuItem.getItemId()) {
-case R.id.nav_dashboard:
+case R.id.nav_workflows:
 
-fragment = new WorkflowViewpager();
+fragment = new WorkflowFragment();
 fragmentManager.beginTransaction()
 .replace(R.id.frame_container, 
fragment)
 
.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_CLOSE)
@@ -127,6 +129,19 @@ public class DashboardMainActivity extends 
AppCompatActivity {
 menuItem.setChecked(true);
 mDrawerLayout.closeDrawers();
 return true;
+
+case R.id.nav_favourite_workflow:
+
+fragment = new FavoriteFragment();
+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_announcement:
 
 fragment = new AnnouncementFragment();

http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/77b4704e/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 f56e06d..47b451b 100644
--- a/app/src/main/res/menu/drawer_view.xml
+++ b/app/src/main/res/menu/drawer_view.xml
@@ -18,9 +18,15 @@
 


+
+   
+

[08/21] incubator-taverna-mobile git commit: add toolbar layout

[ianwdunlop]

add toolbar layout


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/79b8636c
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/79b8636c
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/79b8636c

Branch: refs/heads/master
Commit: 79b8636c7fbc5566c09a857b9e1a6db87bf4c3ad
Parents: dc880ac
Author: Sagar 
Authored: Sun Jul 10 00:27:44 2016 +0530
Committer: Sagar 
Committed: Sun Jul 10 00:27:44 2016 +0530

--
 app/src/main/res/layout/appbar.xml | 12 
 1 file changed, 12 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/79b8636c/app/src/main/res/layout/appbar.xml
--
diff --git a/app/src/main/res/layout/appbar.xml 
b/app/src/main/res/layout/appbar.xml
new file mode 100644
index 000..f7793a6
--- /dev/null
+++ b/app/src/main/res/layout/appbar.xml
@@ -0,0 +1,12 @@
+
+http://schemas.android.com/apk/res/android";
+xmlns:app="http://schemas.android.com/apk/res-auto";
+android:layout_width="match_parent"
+android:id="@+id/toolbar"
+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"/>
+

[02/21] incubator-taverna-mobile git commit: add favourite workflow list fragment layout xml

[ianwdunlop]

add favourite workflow list fragment layout xml


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/021d7aac
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/021d7aac
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/021d7aac

Branch: refs/heads/master
Commit: 021d7aac56dbf6653323f30ad260c56e883a490a
Parents: 77b4704
Author: Sagar 
Authored: Sat Jul 9 22:51:23 2016 +0530
Committer: Sagar 
Committed: Sat Jul 9 22:51:23 2016 +0530

--
 .../layout/fragment_favourite_workflow_list.xml | 23 
 1 file changed, 23 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/021d7aac/app/src/main/res/layout/fragment_favourite_workflow_list.xml
--
diff --git a/app/src/main/res/layout/fragment_favourite_workflow_list.xml 
b/app/src/main/res/layout/fragment_favourite_workflow_list.xml
new file mode 100644
index 000..e1a4c9a
--- /dev/null
+++ b/app/src/main/res/layout/fragment_favourite_workflow_list.xml
@@ -0,0 +1,23 @@
+
+http://schemas.android.com/apk/res/android";
+android:layout_width="match_parent"
+android:layout_height="match_parent"
+android:background="@color/grey_background">
+
+
+
+
+
\ No newline at end of file

[09/21] incubator-taverna-mobile git commit: remove toolbar

[ianwdunlop]

remove toolbar


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/1b78a0fc
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/1b78a0fc
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/1b78a0fc

Branch: refs/heads/master
Commit: 1b78a0fc13f1275e8bd5dbb3d0cfec002a8e38d3
Parents: 79b8636
Author: Sagar 
Authored: Sun Jul 10 00:28:50 2016 +0530
Committer: Sagar 
Committed: Sun Jul 10 00:28:50 2016 +0530

--
 .../mobile/ui/anouncements/AnnouncementFragment.java| 12 
 app/src/main/res/layout/fragment_announcement.xml   | 10 --
 2 files changed, 22 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/1b78a0fc/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 a066da7..5ebac60 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
@@ -33,13 +33,10 @@ import android.os.Bundle;
 import android.support.design.widget.Snackbar;
 import android.support.v4.app.Fragment;
 import android.support.v4.widget.SwipeRefreshLayout;
-import android.support.v7.app.ActionBar;
 import android.support.v7.app.AlertDialog;
-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;
@@ -116,15 +113,6 @@ public class AnnouncementFragment extends Fragment 
implements RecyclerItemClickL
 ButterKnife.bind(this, rootView);
 mAnnouncementPresenter.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);

http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/1b78a0fc/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 335a1b8..93fee6e 100644
--- a/app/src/main/res/layout/fragment_announcement.xml
+++ b/app/src/main/res/layout/fragment_announcement.xml
@@ -17,18 +17,8 @@
 -->
 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">
-
 
 

[19/21] incubator-taverna-mobile git commit: comment debug log in adapter

[ianwdunlop]

comment debug log in adapter


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/3c9f48aa
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/3c9f48aa
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/3c9f48aa

Branch: refs/heads/master
Commit: 3c9f48aa6520ad04e245f406abe4aa19dc9aed15
Parents: 8383afb
Author: Sagar 
Authored: Tue Jul 12 19:41:48 2016 +0530
Committer: Sagar 
Committed: Tue Jul 12 19:41:48 2016 +0530

--
 .../taverna/mobile/ui/adapter/FavouriteWorkflowsAdapter.java  | 3 +--
 .../org/apache/taverna/mobile/ui/adapter/WorkflowAdapter.java | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/3c9f48aa/app/src/main/java/org/apache/taverna/mobile/ui/adapter/FavouriteWorkflowsAdapter.java
--
diff --git 
a/app/src/main/java/org/apache/taverna/mobile/ui/adapter/FavouriteWorkflowsAdapter.java
 
b/app/src/main/java/org/apache/taverna/mobile/ui/adapter/FavouriteWorkflowsAdapter.java
index 4bdb0d5..5c8d0ee 100644
--- 
a/app/src/main/java/org/apache/taverna/mobile/ui/adapter/FavouriteWorkflowsAdapter.java
+++ 
b/app/src/main/java/org/apache/taverna/mobile/ui/adapter/FavouriteWorkflowsAdapter.java
@@ -9,7 +9,6 @@ import org.apache.taverna.mobile.data.model.Workflow;
 import android.content.Context;
 import android.net.Uri;
 import android.support.v7.widget.RecyclerView;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -79,7 +78,7 @@ public class FavouriteWorkflowsAdapter extends 
RecyclerView.Adapterhttp://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/3c9f48aa/app/src/main/java/org/apache/taverna/mobile/ui/adapter/WorkflowAdapter.java
--
diff --git 
a/app/src/main/java/org/apache/taverna/mobile/ui/adapter/WorkflowAdapter.java 
b/app/src/main/java/org/apache/taverna/mobile/ui/adapter/WorkflowAdapter.java
index 66c70dc..82ca86b 100644
--- 
a/app/src/main/java/org/apache/taverna/mobile/ui/adapter/WorkflowAdapter.java
+++ 
b/app/src/main/java/org/apache/taverna/mobile/ui/adapter/WorkflowAdapter.java
@@ -9,7 +9,6 @@ import org.apache.taverna.mobile.data.model.Workflow;
 import android.content.Context;
 import android.net.Uri;
 import android.support.v7.widget.RecyclerView;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -90,7 +89,7 @@ public class WorkflowAdapter extends 
RecyclerView.Adapter

[18/21] incubator-taverna-mobile git commit: add single line in xml

[ianwdunlop]

add single line in xml


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/8383afbe
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/8383afbe
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/8383afbe

Branch: refs/heads/master
Commit: 8383afbe1e95c79fa5b248e0486c4c2309821018
Parents: 8bc9a98
Author: Sagar 
Authored: Tue Jul 12 19:40:56 2016 +0530
Committer: Sagar 
Committed: Tue Jul 12 19:40:56 2016 +0530

--
 .../taverna/mobile/ui/adapter/FavouriteWorkflowsAdapter.java | 8 +---
 .../apache/taverna/mobile/ui/adapter/WorkflowAdapter.java| 8 +---
 app/src/main/res/layout/item_recyclerview_dashboard.xml  | 2 ++
 .../res/layout/item_recyclerview_favourite_workflow_list.xml | 2 ++
 4 files changed, 6 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/8383afbe/app/src/main/java/org/apache/taverna/mobile/ui/adapter/FavouriteWorkflowsAdapter.java
--
diff --git 
a/app/src/main/java/org/apache/taverna/mobile/ui/adapter/FavouriteWorkflowsAdapter.java
 
b/app/src/main/java/org/apache/taverna/mobile/ui/adapter/FavouriteWorkflowsAdapter.java
index e327534..4bdb0d5 100644
--- 
a/app/src/main/java/org/apache/taverna/mobile/ui/adapter/FavouriteWorkflowsAdapter.java
+++ 
b/app/src/main/java/org/apache/taverna/mobile/ui/adapter/FavouriteWorkflowsAdapter.java
@@ -60,15 +60,9 @@ public class FavouriteWorkflowsAdapter extends 
RecyclerView.Adapter 50) {
-title = title + " ... ";
-}
 
 ((ViewHolder) holder).tvDate.setText(date);
-((ViewHolder) holder).tvTitle.setText(title);
+((ViewHolder) holder).tvTitle.setText(workflow.getTitle());
 ((ViewHolder) 
holder).tvType.setText(workflow.getType().getContent());
 ((ViewHolder) 
holder).tvUploader.setText(workflow.getUploader().getContent());
 

http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/8383afbe/app/src/main/java/org/apache/taverna/mobile/ui/adapter/WorkflowAdapter.java
--
diff --git 
a/app/src/main/java/org/apache/taverna/mobile/ui/adapter/WorkflowAdapter.java 
b/app/src/main/java/org/apache/taverna/mobile/ui/adapter/WorkflowAdapter.java
index 30dff3e..66c70dc 100644
--- 
a/app/src/main/java/org/apache/taverna/mobile/ui/adapter/WorkflowAdapter.java
+++ 
b/app/src/main/java/org/apache/taverna/mobile/ui/adapter/WorkflowAdapter.java
@@ -71,15 +71,9 @@ public class WorkflowAdapter extends 
RecyclerView.Adapter 50) {
-title = title + " ... ";
-}
 
 ((ViewHolder) holder).tvDate.setText(date);
-((ViewHolder) holder).tvTitle.setText(title);
+((ViewHolder) holder).tvTitle.setText(workflow.getTitle());
 ((ViewHolder) 
holder).tvType.setText(workflow.getType().getContent());
 ((ViewHolder) 
holder).tvUploader.setText(workflow.getUploader().getContent());
 

http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/8383afbe/app/src/main/res/layout/item_recyclerview_dashboard.xml
--
diff --git a/app/src/main/res/layout/item_recyclerview_dashboard.xml 
b/app/src/main/res/layout/item_recyclerview_dashboard.xml
index 88658bd..0785e1b 100644
--- a/app/src/main/res/layout/item_recyclerview_dashboard.xml
+++ b/app/src/main/res/layout/item_recyclerview_dashboard.xml
@@ -87,6 +87,8 @@
 android:paddingRight="0dp"
 android:paddingEnd="0dp"
 android:paddingBottom="5dp"
+android:singleLine="true"
+android:ellipsize="end"
 android:textSize="18sp"
 android:textColor="@android:color/white"/>
 

http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/8383afbe/app/src/main/res/layout/item_recyclerview_favourite_workflow_list.xml
--
diff --git 
a/app/src/main/res/layout/item_recyclerview_favourite_workflow_list.xml 
b/app/src/main/res/layout/item_recyclerview_favourite_workflow_list.xml
index 88658bd..0785e1b 100644
--- a/app/src/main/res/layout/item_recyclerview_favourite_workflow_list.xml
+++ b/app/src/main/res/layout/item_recyclerview_favourite_workflow_list.xml
@@ -87,6 +87,8 @@
 android:paddingRight="0dp"
 android:paddingEnd="0dp"
 android:paddingBottom="5dp"
+android:singleLine="true"
+android:ellipsize="end"
 android:textSize="18sp"
 

[14/21] incubator-taverna-mobile git commit: add ASF header

[ianwdunlop]

add ASF header


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/6aca1bd1
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/6aca1bd1
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/6aca1bd1

Branch: refs/heads/master
Commit: 6aca1bd1a4bb0a15365c936384c372aa68b480d3
Parents: 84d40fd
Author: Sagar 
Authored: Sun Jul 10 00:48:22 2016 +0530
Committer: Sagar 
Committed: Sun Jul 10 00:48:22 2016 +0530

--
 .../FavouriteWorkflowsFragment.java | 18 
 app/src/main/res/layout/appbar.xml  | 16 +++
 .../layout/fragment_favourite_workflow_list.xml | 16 +++
 ...tem_recyclerview_favourite_workflow_list.xml | 16 +++
 app/src/main/res/menu/drawer_view.xml   | 29 ++--
 5 files changed, 81 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/6aca1bd1/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflow/FavouriteWorkflowsFragment.java
--
diff --git 
a/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflow/FavouriteWorkflowsFragment.java
 
b/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflow/FavouriteWorkflowsFragment.java
index 4447351..7d4588d 100644
--- 
a/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflow/FavouriteWorkflowsFragment.java
+++ 
b/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflow/FavouriteWorkflowsFragment.java
@@ -1,3 +1,21 @@
+/*
+ * 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.
+ */
 package org.apache.taverna.mobile.ui.favouriteworkflow;
 
 

http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/6aca1bd1/app/src/main/res/layout/appbar.xml
--
diff --git a/app/src/main/res/layout/appbar.xml 
b/app/src/main/res/layout/appbar.xml
index f7793a6..29776a1 100644
--- a/app/src/main/res/layout/appbar.xml
+++ b/app/src/main/res/layout/appbar.xml
@@ -1,4 +1,20 @@
 
+
 http://schemas.android.com/apk/res/android";
 xmlns:app="http://schemas.android.com/apk/res-auto";

http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/6aca1bd1/app/src/main/res/layout/fragment_favourite_workflow_list.xml
--
diff --git a/app/src/main/res/layout/fragment_favourite_workflow_list.xml 
b/app/src/main/res/layout/fragment_favourite_workflow_list.xml
index e7bf0ef..2ac917d 100644
--- a/app/src/main/res/layout/fragment_favourite_workflow_list.xml
+++ b/app/src/main/res/layout/fragment_favourite_workflow_list.xml
@@ -1,4 +1,20 @@
 
+
 http://schemas.android.com/apk/res/android";
 android:layout_width="match_parent"

http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/6aca1bd1/app/src/main/res/layout/item_recyclerview_favourite_workflow_list.xml
--
diff --git 
a/app/src/main/res/layout/item_recyclerview_favourite_workflow_list.xml 
b/app/src/main/res/layout/item_recyclerview_favourite_workflow_list.xml
index 9fe6384..88658bd 100644
--- a/app/src/main/res/layout/item_recyclerview_favourite_workflow_list.xml
+++ b/app/src/main/res/layout/item_recyclerview_favourite_workflow_list.xml
@@ -1,4 +1,20 @@
 
+
 http://schemas.android.com/apk/res/android";
 xmlns:app="http://schemas.android.com/apk/res-auto";

http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/6aca1bd1/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 47b451b..4e799ee 100644
--- a/app/src/main/res/menu/drawer_view.xml
+++ b/app/src/main/res/menu/drawer_view.xml
@@ -1,19 +1,20 @@
 
 
+   Licensed to the Apache Software Foundation (ASF) u

[06/21] incubator-taverna-mobile git commit: add favourite workflow list presenter layer

[ianwdunlop]

add favourite workflow list presenter layer


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/3c7f4c1d
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/3c7f4c1d
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/3c7f4c1d

Branch: refs/heads/master
Commit: 3c7f4c1dbcf663a6b055e6af84e31cf9a559e00c
Parents: c39d6b4
Author: Sagar 
Authored: Sat Jul 9 23:50:17 2016 +0530
Committer: Sagar 
Committed: Sat Jul 9 23:50:17 2016 +0530

--
 .../FavouriteWorkflowsMvpView.java  | 36 +
 .../FavouriteWorkflowsPresenter.java| 84 
 2 files changed, 120 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/3c7f4c1d/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflow/FavouriteWorkflowsMvpView.java
--
diff --git 
a/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflow/FavouriteWorkflowsMvpView.java
 
b/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflow/FavouriteWorkflowsMvpView.java
new file mode 100644
index 000..678f8b4
--- /dev/null
+++ 
b/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflow/FavouriteWorkflowsMvpView.java
@@ -0,0 +1,36 @@
+/*
+ * 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.
+ */
+package org.apache.taverna.mobile.ui.favouriteworkflow;
+
+
+import org.apache.taverna.mobile.data.model.Workflow;
+import org.apache.taverna.mobile.ui.base.MvpView;
+
+import java.util.List;
+
+public interface FavouriteWorkflowsMvpView extends MvpView {
+
+void showProgressbar(boolean b);
+
+void showErrorSnackBar();
+
+void showWorkflows(List workflowList);
+
+void showNoWorkflowError();
+}

http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/3c7f4c1d/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflow/FavouriteWorkflowsPresenter.java
--
diff --git 
a/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflow/FavouriteWorkflowsPresenter.java
 
b/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflow/FavouriteWorkflowsPresenter.java
new file mode 100644
index 000..b46d41e
--- /dev/null
+++ 
b/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflow/FavouriteWorkflowsPresenter.java
@@ -0,0 +1,84 @@
+/*
+ * 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.
+ */
+package org.apache.taverna.mobile.ui.favouriteworkflow;
+
+import org.apache.taverna.mobile.data.DataManager;
+import org.apache.taverna.mobile.data.model.Workflow;
+import org.apache.taverna.mobile.ui.base.BasePresenter;
+
+import java.util.List;
+
+import rx.Observer;
+import rx.Subscription;
+import rx.android.schedulers.AndroidSchedulers;
+import rx.schedulers.Schedulers;
+
+public class FavouriteWorkflowsPresenter extends 
BasePresenter {
+
+public final String LOG_TAG = getClass().getSimpleName();
+private DataManager mDataManager;
+private Subscription mSubscriptions;
+
+
+public FavouriteWorkflowsPresenter(DataManager dataManager) {
+mDataManager = dataManager;
+}
+
+@Override
+public void atta

[20/21] incubator-taverna-mobile git commit: rename ShowNoWorkflowError -> ShowEmptyWorkflow

[ianwdunlop]

rename ShowNoWorkflowError -> ShowEmptyWorkflow


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/20fa6c76
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/20fa6c76
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/20fa6c76

Branch: refs/heads/master
Commit: 20fa6c768038d74dd20644f7f01860da9c52776a
Parents: 3c9f48a
Author: Sagar 
Authored: Tue Jul 12 19:42:57 2016 +0530
Committer: Sagar 
Committed: Tue Jul 12 19:42:57 2016 +0530

--
 .../mobile/ui/favouriteworkflow/FavouriteWorkflowsFragment.java| 2 +-
 .../mobile/ui/favouriteworkflow/FavouriteWorkflowsMvpView.java | 2 +-
 .../mobile/ui/favouriteworkflow/FavouriteWorkflowsPresenter.java   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/20fa6c76/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflow/FavouriteWorkflowsFragment.java
--
diff --git 
a/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflow/FavouriteWorkflowsFragment.java
 
b/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflow/FavouriteWorkflowsFragment.java
index 16e34e9..18ff017 100644
--- 
a/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflow/FavouriteWorkflowsFragment.java
+++ 
b/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflow/FavouriteWorkflowsFragment.java
@@ -126,7 +126,7 @@ public class FavouriteWorkflowsFragment extends Fragment 
implements FavouriteWor
 }
 
 @Override
-public void showNoWorkflowError() {
+public void showEmptyWorkflow() {
 tvNoWorkflowError.setVisibility(View.VISIBLE);
 }
 }

http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/20fa6c76/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflow/FavouriteWorkflowsMvpView.java
--
diff --git 
a/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflow/FavouriteWorkflowsMvpView.java
 
b/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflow/FavouriteWorkflowsMvpView.java
index 678f8b4..57d259d 100644
--- 
a/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflow/FavouriteWorkflowsMvpView.java
+++ 
b/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflow/FavouriteWorkflowsMvpView.java
@@ -32,5 +32,5 @@ public interface FavouriteWorkflowsMvpView extends MvpView {
 
 void showWorkflows(List workflowList);
 
-void showNoWorkflowError();
+void showEmptyWorkflow();
 }

http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/20fa6c76/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflow/FavouriteWorkflowsPresenter.java
--
diff --git 
a/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflow/FavouriteWorkflowsPresenter.java
 
b/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflow/FavouriteWorkflowsPresenter.java
index 498fa9c..ba3655b 100644
--- 
a/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflow/FavouriteWorkflowsPresenter.java
+++ 
b/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflow/FavouriteWorkflowsPresenter.java
@@ -73,7 +73,7 @@ public class FavouriteWorkflowsPresenter extends 
BasePresenter

[13/21] incubator-taverna-mobile git commit: add NO Favourite workflow error logic in UI

[ianwdunlop]

add NO Favourite workflow error logic in UI


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/84d40fda
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/84d40fda
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/84d40fda

Branch: refs/heads/master
Commit: 84d40fda9bc7718355296c727d62890ae3a6e288
Parents: bde1377
Author: Sagar 
Authored: Sun Jul 10 00:42:11 2016 +0530
Committer: Sagar 
Committed: Sun Jul 10 00:42:11 2016 +0530

--
 .../mobile/ui/favouriteworkflow/FavouriteWorkflowsFragment.java | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/84d40fda/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflow/FavouriteWorkflowsFragment.java
--
diff --git 
a/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflow/FavouriteWorkflowsFragment.java
 
b/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflow/FavouriteWorkflowsFragment.java
index 0af0101..4447351 100644
--- 
a/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflow/FavouriteWorkflowsFragment.java
+++ 
b/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflow/FavouriteWorkflowsFragment.java
@@ -16,6 +16,7 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ProgressBar;
+import android.widget.TextView;
 
 import java.util.List;
 
@@ -32,6 +33,8 @@ public class FavouriteWorkflowsFragment extends Fragment 
implements FavouriteWor
 @BindView(R.id.progress_circular)
 ProgressBar mProgressBar;
 
+@BindView(R.id.error_no_workflow)
+TextView tvNoWorkflowError;
 private DataManager dataManager;
 
 private FavouriteWorkflowsPresenter mFavouriteWorkflowsPresenter;
@@ -104,6 +107,6 @@ public class FavouriteWorkflowsFragment extends Fragment 
implements FavouriteWor
 
 @Override
 public void showNoWorkflowError() {
-
+tvNoWorkflowError.setVisibility(View.VISIBLE);
 }
 }

[16/21] incubator-taverna-mobile git commit: add Activity utils class

[ianwdunlop]

add Activity utils class


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/bafa7a71
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/bafa7a71
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/bafa7a71

Branch: refs/heads/master
Commit: bafa7a71b4e357ea6ff4a17c6ec4347f645a7d1d
Parents: 1257c51
Author: Sagar 
Authored: Tue Jul 12 19:37:49 2016 +0530
Committer: Sagar 
Committed: Tue Jul 12 19:37:49 2016 +0530

--
 .../taverna/mobile/utils/ActivityUtils.java | 37 
 1 file changed, 37 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/bafa7a71/app/src/main/java/org/apache/taverna/mobile/utils/ActivityUtils.java
--
diff --git 
a/app/src/main/java/org/apache/taverna/mobile/utils/ActivityUtils.java 
b/app/src/main/java/org/apache/taverna/mobile/utils/ActivityUtils.java
new file mode 100644
index 000..c7f68f5
--- /dev/null
+++ b/app/src/main/java/org/apache/taverna/mobile/utils/ActivityUtils.java
@@ -0,0 +1,37 @@
+/*
+ * 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.
+ */
+package org.apache.taverna.mobile.utils;
+
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentManager;
+import android.support.v4.app.FragmentTransaction;
+
+public class ActivityUtils {
+
+
+public static void addFragmentToActivity (FragmentManager fragmentManager,
+  Fragment fragment, int frameId) {
+FragmentTransaction transaction = fragmentManager.beginTransaction();
+transaction.replace(frameId, fragment);
+transaction.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_CLOSE);
+transaction.addToBackStack(null);
+transaction.commit();
+}
+
+}
\ No newline at end of file

[05/21] incubator-taverna-mobile git commit: add method in Data layer to interact DB layer to get favourite workflow list

[ianwdunlop]

add method in Data layer to interact DB layer to get favourite workflow list


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/c39d6b4d
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/c39d6b4d
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/c39d6b4d

Branch: refs/heads/master
Commit: c39d6b4d0cb3bad3fcf1a3c6fc96b74087cae18f
Parents: c4698a8
Author: Sagar 
Authored: Sat Jul 9 23:30:27 2016 +0530
Committer: Sagar 
Committed: Sat Jul 9 23:30:27 2016 +0530

--
 .../java/org/apache/taverna/mobile/data/DataManager.java| 9 +
 1 file changed, 9 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/c39d6b4d/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 ce414ad..e1ce8e6 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
@@ -27,6 +27,7 @@ import org.apache.taverna.mobile.data.model.User;
 import org.apache.taverna.mobile.data.model.Workflows;
 import org.apache.taverna.mobile.data.remote.BaseApiManager;
 
+import java.util.List;
 import java.util.Map;
 
 import rx.Observable;
@@ -115,4 +116,12 @@ public class DataManager {
 return mDBHelper.getFavouriteWorkflow(id);
 }
 
+/**
+ * @return Favourite Workflow list
+ */
+
+public Observable> getFavoriteWorkflowList() {
+return mDBHelper.getFavouriteWorkflow();
+}
+
 }
\ No newline at end of file

[11/21] incubator-taverna-mobile git commit: add toolbar and remove viewpager from onCreate

[ianwdunlop]

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 
Authored: Sun Jul 10 00:31:44 2016 +0530
Committer: Sagar 
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.
 -->
 
 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:

[03/21] incubator-taverna-mobile git commit: add favourite workflow list item layout xml

[ianwdunlop]

add favourite workflow list item layout xml


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/1e66e3bf
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/1e66e3bf
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/1e66e3bf

Branch: refs/heads/master
Commit: 1e66e3bfedb22ec8f54a9cdd8eefdd370df01acd
Parents: 021d7aa
Author: Sagar 
Authored: Sat Jul 9 23:08:45 2016 +0530
Committer: Sagar 
Committed: Sat Jul 9 23:08:45 2016 +0530

--
 ...tem_recyclerview_favourite_workflow_list.xml | 77 
 1 file changed, 77 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/1e66e3bf/app/src/main/res/layout/item_recyclerview_favourite_workflow_list.xml
--
diff --git 
a/app/src/main/res/layout/item_recyclerview_favourite_workflow_list.xml 
b/app/src/main/res/layout/item_recyclerview_favourite_workflow_list.xml
new file mode 100644
index 000..9fe6384
--- /dev/null
+++ b/app/src/main/res/layout/item_recyclerview_favourite_workflow_list.xml
@@ -0,0 +1,77 @@
+
+http://schemas.android.com/apk/res/android";
+xmlns:app="http://schemas.android.com/apk/res-auto";
+android:orientation="vertical"
+android:layout_width="match_parent"
+android:layout_margin="5dp"
+android:layout_height="250dp"
+app:cardCornerRadius="5dp"
+app:cardElevation="1dp">
+
+
+
+
+
+
+
+
\ No newline at end of file

[21/21] incubator-taverna-mobile git commit: remove checkstyle error

[ianwdunlop]

remove checkstyle error


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/a90f32eb
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/a90f32eb
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/a90f32eb

Branch: refs/heads/master
Commit: a90f32eb1082d9003849a33b4689f53e5602f89b
Parents: 20fa6c7
Author: Sagar 
Authored: Tue Jul 12 19:44:43 2016 +0530
Committer: Sagar 
Committed: Tue Jul 12 19:44:43 2016 +0530

--
 .../taverna/mobile/activities/DashboardMainActivity.java  | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/a90f32eb/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 75cff20..aba4947 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
@@ -169,11 +169,11 @@ public class DashboardMainActivity extends 
AppCompatActivity {
 Intent workflowSelectIntent =
 new Intent(Intent.ACTION_GET_CONTENT)
 .setDataAndTypeAndNormalize(
-
Uri.parse(String.format("%s%s%s",
-
Environment.getExternalStorageDirectory(),
-File.separator,
-
APP_DIRECTORY_NAME)),
-
"application/vnd.taverna.t2flow+xml");
+
Uri.parse(String.format("%s%s%s",
+
Environment.getExternalStorageDirectory(),
+File.separator,
+APP_DIRECTORY_NAME)),
+
"application/vnd.taverna.t2flow+xml");
 
 Intent loadWorkflowIntent = 
Intent.createChooser
 (workflowSelectIntent,

[15/21] incubator-taverna-mobile git commit: remove checkstyle error

[ianwdunlop]

remove checkstyle error


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/1257c51e
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/1257c51e
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/1257c51e

Branch: refs/heads/master
Commit: 1257c51eba4b8809ad747ba19d63877e8a1429b0
Parents: 6aca1bd
Author: Sagar 
Authored: Sun Jul 10 00:55:41 2016 +0530
Committer: Sagar 
Committed: Sun Jul 10 00:55:41 2016 +0530

--
 .../taverna/mobile/activities/DashboardMainActivity.java | 6 +++---
 .../taverna/mobile/ui/adapter/FavouriteWorkflowsAdapter.java | 6 +++---
 .../ui/favouriteworkflow/FavouriteWorkflowsFragment.java | 8 +---
 .../ui/favouriteworkflow/FavouriteWorkflowsPresenter.java| 4 ++--
 4 files changed, 13 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/1257c51e/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 6e9cb77..e79a0f5 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
@@ -87,7 +87,7 @@ public class DashboardMainActivity extends AppCompatActivity {
 setSupportActionBar(toolbar);
 
 final ActionBar ab = getSupportActionBar();
-if(ab !=null) {
+if (ab != null) {
 ab.setHomeAsUpIndicator(R.drawable.ic_menu);
 ab.setDisplayHomeAsUpEnabled(true);
 }
@@ -167,11 +167,11 @@ public class DashboardMainActivity extends 
AppCompatActivity {
 Intent workflowSelectIntent =
 new Intent(Intent.ACTION_GET_CONTENT)
 .setDataAndTypeAndNormalize(
-
Uri.parse(String.format("%s%s%s",
+
Uri.parse(String.format("%s%s%s",
 
Environment.getExternalStorageDirectory(),
 File.separator,
 APP_DIRECTORY_NAME)),
-
"application/vnd.taverna.t2flow+xml");
+
"application/vnd.taverna.t2flow+xml");
 
 Intent loadWorkflowIntent = 
Intent.createChooser
 (workflowSelectIntent,

http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/1257c51e/app/src/main/java/org/apache/taverna/mobile/ui/adapter/FavouriteWorkflowsAdapter.java
--
diff --git 
a/app/src/main/java/org/apache/taverna/mobile/ui/adapter/FavouriteWorkflowsAdapter.java
 
b/app/src/main/java/org/apache/taverna/mobile/ui/adapter/FavouriteWorkflowsAdapter.java
index 93431ba..e327534 100644
--- 
a/app/src/main/java/org/apache/taverna/mobile/ui/adapter/FavouriteWorkflowsAdapter.java
+++ 
b/app/src/main/java/org/apache/taverna/mobile/ui/adapter/FavouriteWorkflowsAdapter.java
@@ -45,9 +45,9 @@ public class FavouriteWorkflowsAdapter extends 
RecyclerView.Adapterhttp://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/1257c51e/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflow/FavouriteWorkflowsFragment.java
--
diff --git 
a/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflow/FavouriteWorkflowsFragment.java
 
b/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflow/FavouriteWorkflowsFragment.java
index 7d4588d..16e34e9 100644
--- 
a/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflow/FavouriteWorkflowsFragment.java
+++ 
b/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflow/FavouriteWorkflowsFragment.java
@@ -73,7 +73,8 @@ public class FavouriteWorkflowsFragment extends Fragment 
implements FavouriteWor
 public View onCreateView(LayoutInflater inflater, ViewGroup container, 
Bundle
 savedInstanceState) {
 
-View rootView = 
inflater.inflate(R.layout.fragment_favourite_workflow_list, container, false);
+View rootView = 
inflater.inflate(R.layout.fragment_favourite_workflow_list,
+container, false);
 
 ButterKnife

[12/21] incubator-taverna-mobile git commit: add NO Favourite workflow error textview in xml

[ianwdunlop]

add NO Favourite workflow error textview in xml


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/bde13771
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/bde13771
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/bde13771

Branch: refs/heads/master
Commit: bde1377179e099d3c58c5f5ed00fb5cbf27ff5b2
Parents: fae286a
Author: Sagar 
Authored: Sun Jul 10 00:39:38 2016 +0530
Committer: Sagar 
Committed: Sun Jul 10 00:39:38 2016 +0530

--
 .../main/res/layout/fragment_favourite_workflow_list.xml  | 10 ++
 app/src/main/res/values/strings.xml   |  1 +
 2 files changed, 11 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/bde13771/app/src/main/res/layout/fragment_favourite_workflow_list.xml
--
diff --git a/app/src/main/res/layout/fragment_favourite_workflow_list.xml 
b/app/src/main/res/layout/fragment_favourite_workflow_list.xml
index 8d5fef6..e7bf0ef 100644
--- a/app/src/main/res/layout/fragment_favourite_workflow_list.xml
+++ b/app/src/main/res/layout/fragment_favourite_workflow_list.xml
@@ -20,4 +20,14 @@
 android:layout_centerHorizontal="true"
 android:layout_centerVertical="true"
 android:visibility="visible"/>
+
+
 
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/bde13771/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 a13b6f9..e53dc06 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -112,4 +112,5 @@ limitations under the License.
 Announcementss
 No Internet Connection
 Licence
+No Favourite Workflow 
Found!!!
 

[07/21] incubator-taverna-mobile git commit: add favourite workflow list recyclerview adapter

[ianwdunlop]

add favourite workflow list recyclerview adapter


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/dc880ac9
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/dc880ac9
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/dc880ac9

Branch: refs/heads/master
Commit: dc880ac97d4d1f46b09c8514ce8c331b9bec15f1
Parents: 3c7f4c1
Author: Sagar 
Authored: Sat Jul 9 23:54:49 2016 +0530
Committer: Sagar 
Committed: Sat Jul 9 23:54:49 2016 +0530

--
 .../ui/adapter/FavouriteWorkflowsAdapter.java   | 117 +++
 1 file changed, 117 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/dc880ac9/app/src/main/java/org/apache/taverna/mobile/ui/adapter/FavouriteWorkflowsAdapter.java
--
diff --git 
a/app/src/main/java/org/apache/taverna/mobile/ui/adapter/FavouriteWorkflowsAdapter.java
 
b/app/src/main/java/org/apache/taverna/mobile/ui/adapter/FavouriteWorkflowsAdapter.java
new file mode 100644
index 000..93431ba
--- /dev/null
+++ 
b/app/src/main/java/org/apache/taverna/mobile/ui/adapter/FavouriteWorkflowsAdapter.java
@@ -0,0 +1,117 @@
+package org.apache.taverna.mobile.ui.adapter;
+
+import com.bumptech.glide.Glide;
+import com.bumptech.glide.load.engine.DiskCacheStrategy;
+
+import org.apache.taverna.mobile.R;
+import org.apache.taverna.mobile.data.model.Workflow;
+
+import android.content.Context;
+import android.net.Uri;
+import android.support.v7.widget.RecyclerView;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import java.util.List;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+
+public class FavouriteWorkflowsAdapter extends 
RecyclerView.Adapter {
+
+private static final String TAG = 
FavouriteWorkflowsAdapter.class.getName();
+
+private final List mWorkflowList;
+
+private final Context context;
+
+public FavouriteWorkflowsAdapter(List mWorkflowList, Context 
context) {
+this.mWorkflowList = mWorkflowList;
+this.context = context;
+
+}
+
+public void addWorkflow(Workflow workflow) {
+this.mWorkflowList.add(workflow);
+this.notifyDataSetChanged();
+
+}
+
+@Override
+public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int 
viewType) {
+RecyclerView.ViewHolder vh;
+
+View v = LayoutInflater.from(parent.getContext()).inflate(
+R.layout.item_recyclerview_favourite_workflow_list, 
parent, false);
+vh = new ViewHolder(v);
+
+return vh;
+}
+
+@Override
+public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) 
{
+if (holder instanceof ViewHolder) {
+
+Workflow workflow = mWorkflowList.get(position);
+String date = workflow.getCreatedAt()
+.substring(0, workflow.getCreatedAt().indexOf(' '));
+
+String title = workflow.getTitle().substring(0,
+Math.min(workflow.getTitle().length(), 50));
+
+if (workflow.getTitle().length() > 50) {
+title = title + " ... ";
+}
+
+((ViewHolder) holder).tvDate.setText(date);
+((ViewHolder) holder).tvTitle.setText(title);
+((ViewHolder) 
holder).tvType.setText(workflow.getType().getContent());
+((ViewHolder) 
holder).tvUploader.setText(workflow.getUploader().getContent());
+
+Uri uri = Uri.parse(workflow.getPreviewUri());
+
+Glide.with(context)
+.load(uri)
+.diskCacheStrategy(DiskCacheStrategy.SOURCE)
+.placeholder(R.drawable.placeholder)
+.error(R.drawable.placeholder)
+.into(((ViewHolder) holder).ivWorkflowImage);
+}
+}
+
+@Override
+public int getItemCount() {
+Log.d(TAG, "getItemCount: " + mWorkflowList.size());
+return mWorkflowList.size();
+}
+
+
+class ViewHolder extends RecyclerView.ViewHolder {
+
+@BindView(R.id.tvDate)
+TextView tvDate;
+
+@BindView(R.id.tvTitle)
+TextView tvTitle;
+
+@BindView(R.id.tvType)
+TextView tvType;
+
+@BindView(R.id.tvUploader)
+TextView tvUploader;
+
+@BindView(R.id.ivWorkflowImage)
+ImageView ivWorkflowImage;
+
+public ViewHolder(View itemView) {
+super(itemView);
+ButterKnife.bind(this, itemView);
+
+}
+}
+
+}

[01/12] incubator-taverna-mobile git commit: add method in dbHelper

[ianwdunlop]

Repository: incubator-taverna-mobile
Updated Branches:
  refs/heads/master a90f32eb1 -> cc142072c


add method in dbHelper


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/6aa8fc1c
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/6aa8fc1c
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/6aa8fc1c

Branch: refs/heads/master
Commit: 6aa8fc1c5e69236b02fe327d4a6264a450a95795
Parents: a90f32e
Author: Sagar 
Authored: Sat Jul 16 23:31:25 2016 +0530
Committer: Sagar 
Committed: Sat Jul 16 23:31:25 2016 +0530

--
 .../apache/taverna/mobile/data/local/DBHelper.java   | 15 +++
 1 file changed, 15 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/6aa8fc1c/app/src/main/java/org/apache/taverna/mobile/data/local/DBHelper.java
--
diff --git 
a/app/src/main/java/org/apache/taverna/mobile/data/local/DBHelper.java 
b/app/src/main/java/org/apache/taverna/mobile/data/local/DBHelper.java
index f81f88e..6f88665 100644
--- a/app/src/main/java/org/apache/taverna/mobile/data/local/DBHelper.java
+++ b/app/src/main/java/org/apache/taverna/mobile/data/local/DBHelper.java
@@ -31,6 +31,7 @@ import java.util.List;
 
 import rx.Observable;
 import rx.Subscriber;
+import rx.functions.Func0;
 
 
 public class DBHelper {
@@ -204,6 +205,20 @@ public class DBHelper {
 
 }
 
+public Observable getFavouriteWorkflowDetail(final String id) {
+return Observable.defer(new Func0>() {
+@Override
+public Observable call() {
+return Observable
+.just(SQLite.select()
+.from(Workflow.class)
+.where(Workflow_Table.id.eq(id))
+.querySingle());
+}
+});
+
+}
+
 
 }
 

[12/12] incubator-taverna-mobile git commit: remove checkstyle error

[ianwdunlop]

remove checkstyle error


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/cc142072
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/cc142072
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/cc142072

Branch: refs/heads/master
Commit: cc142072cf4657fcd0321676cf3a82215d000c07
Parents: 2eca314
Author: Sagar 
Authored: Thu Jul 21 22:55:01 2016 +0530
Committer: Sagar 
Committed: Thu Jul 21 22:55:01 2016 +0530

--
 .../favouriteworkflowdetail/FavouriteWorkflowDetailActivity.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/cc142072/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflowdetail/FavouriteWorkflowDetailActivity.java
--
diff --git 
a/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflowdetail/FavouriteWorkflowDetailActivity.java
 
b/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflowdetail/FavouriteWorkflowDetailActivity.java
index 37b22e7..fe9c07b 100644
--- 
a/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflowdetail/FavouriteWorkflowDetailActivity.java
+++ 
b/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflowdetail/FavouriteWorkflowDetailActivity.java
@@ -58,7 +58,8 @@ public class FavouriteWorkflowDetailActivity extends 
AppCompatActivity {
 getSupportFragmentManager().beginTransaction()
 .add(R.id.frame_container
 , FavouriteWorkflowDetailFragment
-
.newInstance(getIntent().getStringExtra(FavouriteWorkflowsFragment.EXTRA_ID)))
+.newInstance(getIntent()
+
.getStringExtra(FavouriteWorkflowsFragment.EXTRA_ID)))
 .commit();
 }
 

[10/12] incubator-taverna-mobile git commit: public static variable for putExtra string argument

[ianwdunlop]

public static variable for putExtra string argument


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/feed1168
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/feed1168
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/feed1168

Branch: refs/heads/master
Commit: feed11688b661abdb5ed8e0b401d5f9c78b274e7
Parents: 87f2dcb
Author: Sagar 
Authored: Thu Jul 21 22:36:57 2016 +0530
Committer: Sagar 
Committed: Thu Jul 21 22:36:57 2016 +0530

--
 .../ui/favouriteworkflow/FavouriteWorkflowsFragment.java  | 7 +--
 .../FavouriteWorkflowDetailActivity.java  | 5 +++--
 2 files changed, 8 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/feed1168/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflow/FavouriteWorkflowsFragment.java
--
diff --git 
a/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflow/FavouriteWorkflowsFragment.java
 
b/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflow/FavouriteWorkflowsFragment.java
index d34a79c..134bd54 100644
--- 
a/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflow/FavouriteWorkflowsFragment.java
+++ 
b/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflow/FavouriteWorkflowsFragment.java
@@ -50,6 +50,9 @@ public class FavouriteWorkflowsFragment extends Fragment
 
 public final String LOG_TAG = getClass().getSimpleName();
 
+public static final String EXTRA_ID = "id";
+
+public static final String EXTRA_TITLE = "title";
 @BindView(R.id.rv_fav_workflows)
 RecyclerView mRecyclerView;
 
@@ -151,8 +154,8 @@ public class FavouriteWorkflowsFragment extends Fragment
 @Override
 public void onItemClick(View childView, int position) {
 Intent intent = new Intent(getActivity(), 
FavouriteWorkflowDetailActivity.class);
-intent.putExtra("id", mWorkflowList.get(position).getId());
-intent.putExtra("title", mWorkflowList.get(position).getTitle());
+intent.putExtra(EXTRA_ID, mWorkflowList.get(position).getId());
+intent.putExtra(EXTRA_TITLE, mWorkflowList.get(position).getTitle());
 startActivity(intent);
 }
 

http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/feed1168/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflowdetail/FavouriteWorkflowDetailActivity.java
--
diff --git 
a/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflowdetail/FavouriteWorkflowDetailActivity.java
 
b/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflowdetail/FavouriteWorkflowDetailActivity.java
index fd40f4e..37b22e7 100644
--- 
a/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflowdetail/FavouriteWorkflowDetailActivity.java
+++ 
b/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflowdetail/FavouriteWorkflowDetailActivity.java
@@ -20,6 +20,7 @@ package org.apache.taverna.mobile.ui.favouriteworkflowdetail;
 
 
 import org.apache.taverna.mobile.R;
+import 
org.apache.taverna.mobile.ui.favouriteworkflow.FavouriteWorkflowsFragment;
 
 import android.os.Bundle;
 import android.support.annotation.Nullable;
@@ -49,7 +50,7 @@ public class FavouriteWorkflowDetailActivity extends 
AppCompatActivity {
 if (actionbar != null) {
 actionbar.setHomeButtonEnabled(true);
 actionbar.setDisplayHomeAsUpEnabled(true);
-actionbar.setTitle(getIntent().getStringExtra("title"));
+
actionbar.setTitle(getIntent().getStringExtra(FavouriteWorkflowsFragment.EXTRA_TITLE));
 }
 
 
@@ -57,7 +58,7 @@ public class FavouriteWorkflowDetailActivity extends 
AppCompatActivity {
 getSupportFragmentManager().beginTransaction()
 .add(R.id.frame_container
 , FavouriteWorkflowDetailFragment
-
.newInstance(getIntent().getStringExtra("id")))
+
.newInstance(getIntent().getStringExtra(FavouriteWorkflowsFragment.EXTRA_ID)))
 .commit();
 }
 

[11/12] incubator-taverna-mobile git commit: replace Subscription to CompositeSubscription where it is needed

[ianwdunlop]

replace Subscription to CompositeSubscription where it is needed


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/2eca314e
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/2eca314e
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/2eca314e

Branch: refs/heads/master
Commit: 2eca314e79d488e871c50198a4a7774f43465f10
Parents: feed116
Author: Sagar 
Authored: Thu Jul 21 22:52:18 2016 +0530
Committer: Sagar 
Committed: Thu Jul 21 22:52:18 2016 +0530

--
 .../ui/anouncements/AnnouncementPresenter.java  | 14 +
 .../FavouriteWorkflowDetailPresenter.java   | 31 
 .../workflowdetail/WorkflowDetailPresenter.java | 29 +-
 3 files changed, 41 insertions(+), 33 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/2eca314e/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 c8ca5a7..97b9a5d 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
@@ -26,20 +26,22 @@ import org.apache.taverna.mobile.ui.base.BasePresenter;
 import android.util.Log;
 
 import rx.Observer;
-import rx.Subscription;
 import rx.android.schedulers.AndroidSchedulers;
 import rx.schedulers.Schedulers;
+import rx.subscriptions.CompositeSubscription;
 
 
 public class AnnouncementPresenter extends BasePresenter {
 
 public final String LOG_TAG = getClass().getSimpleName();
 private DataManager mDataManager;
-private Subscription mSubscriptions;
+private CompositeSubscription mSubscriptions;
 
 
 public AnnouncementPresenter(DataManager dataManager) {
 mDataManager = dataManager;
+
+mSubscriptions = new CompositeSubscription();
 }
 
 @Override
@@ -55,7 +57,7 @@ public class AnnouncementPresenter extends 
BasePresenter {
 
 public void loadAllAnnouncement(int pageNumber) {
 
-mSubscriptions = mDataManager.getAllAnnouncement(pageNumber)
+mSubscriptions.add(mDataManager.getAllAnnouncement(pageNumber)
 .observeOn(AndroidSchedulers.mainThread())
 .subscribeOn(Schedulers.io())
 .subscribe(new Observer() {
@@ -76,12 +78,12 @@ public class AnnouncementPresenter extends 
BasePresenter {
 getMvpView().showAllAnouncement(announcement);
 Log.d(LOG_TAG, 
announcement.getAnnouncement().get(1).getResource());
 }
-});
+}));
 }
 
 public void loadAnnouncementDetails(String id) {
 
-mSubscriptions = mDataManager.getAnnouncementDetail(id)
+mSubscriptions.add(mDataManager.getAnnouncementDetail(id)
 .observeOn(AndroidSchedulers.mainThread())
 .subscribeOn(Schedulers.io())
 .subscribe(new Observer() {
@@ -102,7 +104,7 @@ public class AnnouncementPresenter extends 
BasePresenter {
 
getMvpView().showAnnouncementDetail(detailAnnouncement);
 
 }
-});
+}));
 }
 
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/2eca314e/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflowdetail/FavouriteWorkflowDetailPresenter.java
--
diff --git 
a/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflowdetail/FavouriteWorkflowDetailPresenter.java
 
b/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflowdetail/FavouriteWorkflowDetailPresenter.java
index 05ce59d..91905d1 100644
--- 
a/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflowdetail/FavouriteWorkflowDetailPresenter.java
+++ 
b/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflowdetail/FavouriteWorkflowDetailPresenter.java
@@ -28,20 +28,25 @@ import java.util.HashMap;
 import java.util.Map;
 
 import rx.Observer;
-import rx.Subscription;
 import rx.android.schedulers.AndroidSchedulers;
 import rx.schedulers.Schedulers;
+import rx.subscriptions.CompositeSubscription;
 
 public class FavouriteWorkflowDetailPresenter extends
 BasePresenter {
 
 public final String LOG_TAG = getClass().getSimpleName();
+
 private DataManager mDataManager;
-private Subscription mSubscriptions;
+
+

[04/12] incubator-taverna-mobile git commit: Add Favourite workflow detail MvpView & Presenter

[ianwdunlop]

Add Favourite workflow detail MvpView & Presenter


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/2b02be87
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/2b02be87
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/2b02be87

Branch: refs/heads/master
Commit: 2b02be8735aaca7b7c9de2102771b556637c5176
Parents: 05540b1
Author: Sagar 
Authored: Tue Jul 19 00:37:16 2016 +0530
Committer: Sagar 
Committed: Tue Jul 19 00:37:16 2016 +0530

--
 .../FavouriteWorkflowDetailMvpView.java |  44 
 .../FavouriteWorkflowDetailPresenter.java   | 211 +++
 2 files changed, 255 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/2b02be87/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflowdetail/FavouriteWorkflowDetailMvpView.java
--
diff --git 
a/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflowdetail/FavouriteWorkflowDetailMvpView.java
 
b/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflowdetail/FavouriteWorkflowDetailMvpView.java
new file mode 100644
index 000..a3ec3b5
--- /dev/null
+++ 
b/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflowdetail/FavouriteWorkflowDetailMvpView.java
@@ -0,0 +1,44 @@
+/*
+ * 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.
+ */
+package org.apache.taverna.mobile.ui.favouriteworkflowdetail;
+
+
+import org.apache.taverna.mobile.data.model.License;
+import org.apache.taverna.mobile.data.model.User;
+import org.apache.taverna.mobile.data.model.Workflow;
+import org.apache.taverna.mobile.ui.base.MvpView;
+
+public interface FavouriteWorkflowDetailMvpView extends MvpView {
+
+void showProgressbar(boolean b);
+
+void showWorkflowDetail(Workflow workflow);
+
+void setImage(User user);
+
+void showErrorSnackBar(String error);
+
+void showLicense(License license);
+
+void showLicenseProgress(boolean b);
+
+void setFavouriteIcon();
+
+void getFavouriteIcon(boolean b);
+}

http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/2b02be87/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflowdetail/FavouriteWorkflowDetailPresenter.java
--
diff --git 
a/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflowdetail/FavouriteWorkflowDetailPresenter.java
 
b/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflowdetail/FavouriteWorkflowDetailPresenter.java
new file mode 100644
index 000..023c911
--- /dev/null
+++ 
b/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflowdetail/FavouriteWorkflowDetailPresenter.java
@@ -0,0 +1,211 @@
+/*
+ * 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.
+ */
+package org.apache.taverna.mobile.ui.favouriteworkflowdetail;
+
+import org.apache.taverna.mobile.data.DataManager;
+import org.apache.taverna.mobile.data.model.License;
+import org.apache.taverna.mobile.data.model.User;
+import org.apache.taverna.mobile.data.model.Workflow;
+import org.apache.taverna.mobile.ui.base.BasePresenter;
+
+import java.util.HashMap;
+import java.util.Map;
+
+im

[06/12] incubator-taverna-mobile git commit: Add Favourite workflow detail Activity in manifest

[ianwdunlop]

Add Favourite workflow detail Activity in manifest


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/cec96be5
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/cec96be5
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/cec96be5

Branch: refs/heads/master
Commit: cec96be58f66feb9552506d347856d34a823
Parents: c12ab57
Author: Sagar 
Authored: Tue Jul 19 00:38:09 2016 +0530
Committer: Sagar 
Committed: Tue Jul 19 00:38:09 2016 +0530

--
 app/src/main/AndroidManifest.xml | 9 +
 1 file changed, 9 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/cec96be5/app/src/main/AndroidManifest.xml
--
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 8d5e2b7..29bb23c 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -110,6 +110,15 @@ limitations under the License.
 android:name="android.support.PARENT_ACTIVITY"
 
android:value="org.apache.taverna.mobile.activities.DashboardMainActivity"/>
 
+
+
+
+
 
 
 

[03/12] incubator-taverna-mobile git commit: Add Favourite workflow detail activity

[ianwdunlop]

Add Favourite workflow detail activity


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/05540b14
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/05540b14
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/05540b14

Branch: refs/heads/master
Commit: 05540b14801e7ee8c1df8a1e76de8c14a6406cab
Parents: ffa7e22
Author: Sagar 
Authored: Tue Jul 19 00:36:34 2016 +0530
Committer: Sagar 
Committed: Tue Jul 19 00:36:34 2016 +0530

--
 .../FavouriteWorkflowDetailActivity.java| 65 
 1 file changed, 65 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/05540b14/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflowdetail/FavouriteWorkflowDetailActivity.java
--
diff --git 
a/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflowdetail/FavouriteWorkflowDetailActivity.java
 
b/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflowdetail/FavouriteWorkflowDetailActivity.java
new file mode 100644
index 000..4b4d81c
--- /dev/null
+++ 
b/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflowdetail/FavouriteWorkflowDetailActivity.java
@@ -0,0 +1,65 @@
+/*
+ * 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.
+ */
+package org.apache.taverna.mobile.ui.favouriteworkflowdetail;
+
+
+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 org.apache.taverna.mobile.R;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+
+public class FavouriteWorkflowDetailActivity 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
+, 
FavouriteWorkflowDetailFragment.newInstance(getIntent().getStringExtra("id")))
+.commit();
+}
+
+}
+}

[05/12] incubator-taverna-mobile git commit: Add Favourite workflow detail Fragment

[ianwdunlop]

Add Favourite workflow detail Fragment


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/c12ab578
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/c12ab578
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/c12ab578

Branch: refs/heads/master
Commit: c12ab5782868a5d0394bcb352ca644719cae4f72
Parents: 2b02be8
Author: Sagar 
Authored: Tue Jul 19 00:37:49 2016 +0530
Committer: Sagar 
Committed: Tue Jul 19 00:37:49 2016 +0530

--
 .../FavouriteWorkflowDetailFragment.java| 321 +++
 1 file changed, 321 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/c12ab578/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
new file mode 100644
index 000..bcf425a
--- /dev/null
+++ 
b/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflowdetail/FavouriteWorkflowDetailFragment.java
@@ -0,0 +1,321 @@
+/*
+ * 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.
+ */
+package org.apache.taverna.mobile.ui.favouriteworkflowdetail;
+
+
+import android.app.ProgressDialog;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.design.widget.Snackbar;
+import android.support.v4.app.Fragment;
+import android.support.v7.app.ActionBar;
+import android.support.v7.app.AlertDialog;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+import android.webkit.WebView;
+import android.widget.Button;
+import android.widget.ImageView;
+import android.widget.ProgressBar;
+import android.widget.RelativeLayout;
+import android.widget.ScrollView;
+import android.widget.TextView;
+
+import com.bumptech.glide.Glide;
+import com.bumptech.glide.load.engine.DiskCacheStrategy;
+
+import org.apache.taverna.mobile.R;
+import org.apache.taverna.mobile.data.DataManager;
+import org.apache.taverna.mobile.data.model.License;
+import org.apache.taverna.mobile.data.model.User;
+import org.apache.taverna.mobile.data.model.Workflow;
+import org.apache.taverna.mobile.utils.ConnectionInfo;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.OnClick;
+
+public class FavouriteWorkflowDetailFragment extends Fragment implements 
FavouriteWorkflowDetailMvpView {
+
+public final String LOG_TAG = getClass().getSimpleName();
+
+@BindView(R.id.ivWorkflowImage)
+ImageView workflowImage;
+
+@BindView(R.id.tvTitle)
+TextView title;
+
+@BindView(R.id.ivUploader)
+ImageView uploaderImage;
+
+@BindView(R.id.tvUploaderName)
+TextView uploaderName;
+
+@BindView(R.id.tvDate)
+TextView date;
+
+@BindView(R.id.tvType)
+TextView type;
+
+@BindView(R.id.tvDescription)
+WebView description;
+
+@BindView(R.id.ivFav)
+ImageView ivFavourite;
+
+@BindView(R.id.progressBar)
+ProgressBar mProgressBar;
+
+@BindView(R.id.scrollView)
+ScrollView mScrollView;
+
+@BindView(R.id.rootLayout)
+RelativeLayout rootLayout;
+
+private AlertDialog alertDialog;
+
+private DataManager dataManager;
+
+private FavouriteWorkflowDetailPresenter mWorkflowDetailPresenter;
+
+private ConnectionInfo mConnectionInfo;
+
+private static final String ID = "id";
+
+private String id;
+
+private String licenceId = null;
+
+private ProgressDialog dialog;
+
+private ActionBar actionBar;
+
+public static FavouriteWorkflowDetailFragment newInstance(String id) {
+
+Bundle args = new Bundle();
+
+args.putString(ID, 

[02/12] incubator-taverna-mobile git commit: add method in data manger to get favourite workflow detail

[ianwdunlop]

add method in data manger to get favourite workflow detail


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/ffa7e224
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/ffa7e224
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/ffa7e224

Branch: refs/heads/master
Commit: ffa7e224f18deb32ed00e9a09a6f942d4950573a
Parents: 6aa8fc1
Author: Sagar 
Authored: Sat Jul 16 23:34:30 2016 +0530
Committer: Sagar 
Committed: Sat Jul 16 23:34:30 2016 +0530

--
 .../java/org/apache/taverna/mobile/data/DataManager.java | 8 
 1 file changed, 8 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/ffa7e224/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 e1ce8e6..636814a 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
@@ -124,4 +124,12 @@ public class DataManager {
 return mDBHelper.getFavouriteWorkflow();
 }
 
+/**
+ * @return Favourite Workflow Detail from DBhelper
+ * @param id is the id of workflow
+ */
+
+public Observable getFavoriteDetailWorkflow(String id) {
+return mDBHelper.getFavouriteWorkflowDetail(id);
+}
 }
\ No newline at end of file

[07/12] incubator-taverna-mobile git commit: add onItemTouchListener for recycler view

[ianwdunlop]

add onItemTouchListener for recycler view


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/47182e0b
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/47182e0b
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/47182e0b

Branch: refs/heads/master
Commit: 47182e0baa6522f604889980bd2a93b11c36e0f4
Parents: cec96be
Author: Sagar 
Authored: Tue Jul 19 00:40:04 2016 +0530
Committer: Sagar 
Committed: Tue Jul 19 00:40:04 2016 +0530

--
 .../FavouriteWorkflowsFragment.java | 46 
 1 file changed, 38 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/47182e0b/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflow/FavouriteWorkflowsFragment.java
--
diff --git 
a/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflow/FavouriteWorkflowsFragment.java
 
b/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflow/FavouriteWorkflowsFragment.java
index 18ff017..9dead78 100644
--- 
a/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflow/FavouriteWorkflowsFragment.java
+++ 
b/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflow/FavouriteWorkflowsFragment.java
@@ -19,11 +19,7 @@
 package org.apache.taverna.mobile.ui.favouriteworkflow;
 
 
-import org.apache.taverna.mobile.R;
-import org.apache.taverna.mobile.data.DataManager;
-import org.apache.taverna.mobile.data.model.Workflow;
-import org.apache.taverna.mobile.ui.adapter.FavouriteWorkflowsAdapter;
-
+import android.content.Intent;
 import android.os.Bundle;
 import android.support.design.widget.Snackbar;
 import android.support.v4.app.Fragment;
@@ -36,12 +32,20 @@ import android.view.ViewGroup;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 
+import org.apache.taverna.mobile.R;
+import org.apache.taverna.mobile.data.DataManager;
+import org.apache.taverna.mobile.data.model.Workflow;
+import org.apache.taverna.mobile.ui.adapter.FavouriteWorkflowsAdapter;
+import org.apache.taverna.mobile.ui.adapter.RecyclerItemClickListner;
+import 
org.apache.taverna.mobile.ui.favouriteworkflowdetail.FavouriteWorkflowDetailActivity;
+
+import java.util.ArrayList;
 import java.util.List;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
 
-public class FavouriteWorkflowsFragment extends Fragment implements 
FavouriteWorkflowsMvpView {
+public class FavouriteWorkflowsFragment extends Fragment implements 
FavouriteWorkflowsMvpView, RecyclerItemClickListner.OnItemClickListener {
 
 public final String LOG_TAG = getClass().getSimpleName();
 
@@ -53,12 +57,15 @@ public class FavouriteWorkflowsFragment extends Fragment 
implements FavouriteWor
 
 @BindView(R.id.error_no_workflow)
 TextView tvNoWorkflowError;
+
 private DataManager dataManager;
 
 private FavouriteWorkflowsPresenter mFavouriteWorkflowsPresenter;
 
 private FavouriteWorkflowsAdapter mFavouriteWorkflowsAdapter;
 
+private List mWorkflowList;
+
 
 @Override
 public void onCreate(Bundle savedInstanceState) {
@@ -67,6 +74,8 @@ public class FavouriteWorkflowsFragment extends Fragment 
implements FavouriteWor
 dataManager = new DataManager();
 
 mFavouriteWorkflowsPresenter = new 
FavouriteWorkflowsPresenter(dataManager);
+
+mWorkflowList = new ArrayList<>();
 }
 
 @Override
@@ -80,12 +89,18 @@ public class FavouriteWorkflowsFragment extends Fragment 
implements FavouriteWor
 
 mFavouriteWorkflowsPresenter.attachView(this);
 
+mFavouriteWorkflowsAdapter = new 
FavouriteWorkflowsAdapter(mWorkflowList, getContext());
+
 final LinearLayoutManager layoutManager = new 
LinearLayoutManager(getActivity());
 
 mRecyclerView.setLayoutManager(layoutManager);
 mRecyclerView.setItemAnimator(new DefaultItemAnimator());
 mRecyclerView.hasFixedSize();
 
+mRecyclerView.addOnItemTouchListener(new 
RecyclerItemClickListner(getActivity(), this));
+
+mRecyclerView.setAdapter(mFavouriteWorkflowsAdapter);
+
 showProgressbar(true);
 mFavouriteWorkflowsPresenter.loadAllWorkflow();
 
@@ -96,8 +111,10 @@ public class FavouriteWorkflowsFragment extends Fragment 
implements FavouriteWor
 @Override
 public void showProgressbar(boolean b) {
 if (b) {
+
 mProgressBar.setVisibility(View.VISIBLE);
 } else {
+
 mProgressBar.setVisibility(View.GONE);
 mRecyclerView.setVisibility(View.VISIBLE);
 }
@@ -121,12 +138,25 @@ public class FavouriteWorkflowsFragment extends Fragment 
implements FavouriteWor
 @Override
 public void sho

[09/12] incubator-taverna-mobile git commit: move showProgressbar to presenter

[ianwdunlop]

move showProgressbar to presenter


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/87f2dcb0
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/87f2dcb0
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/87f2dcb0

Branch: refs/heads/master
Commit: 87f2dcb0f5d4b67ccde41169d214eea6d949ee10
Parents: adb71d4
Author: Sagar 
Authored: Thu Jul 21 22:33:10 2016 +0530
Committer: Sagar 
Committed: Thu Jul 21 22:33:10 2016 +0530

--
 .../mobile/ui/favouriteworkflow/FavouriteWorkflowsFragment.java   | 2 +-
 .../mobile/ui/favouriteworkflow/FavouriteWorkflowsPresenter.java  | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/87f2dcb0/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflow/FavouriteWorkflowsFragment.java
--
diff --git 
a/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflow/FavouriteWorkflowsFragment.java
 
b/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflow/FavouriteWorkflowsFragment.java
index 896462a..d34a79c 100644
--- 
a/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflow/FavouriteWorkflowsFragment.java
+++ 
b/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflow/FavouriteWorkflowsFragment.java
@@ -102,7 +102,7 @@ public class FavouriteWorkflowsFragment extends Fragment
 
 mRecyclerView.setAdapter(mFavouriteWorkflowsAdapter);
 
-showProgressbar(true);
+
 mFavouriteWorkflowsPresenter.loadAllWorkflow();
 
 return rootView;

http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/87f2dcb0/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflow/FavouriteWorkflowsPresenter.java
--
diff --git 
a/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflow/FavouriteWorkflowsPresenter.java
 
b/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflow/FavouriteWorkflowsPresenter.java
index ba3655b..64a1dd3 100644
--- 
a/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflow/FavouriteWorkflowsPresenter.java
+++ 
b/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflow/FavouriteWorkflowsPresenter.java
@@ -52,6 +52,9 @@ public class FavouriteWorkflowsPresenter extends 
BasePresenter

[08/12] incubator-taverna-mobile git commit: remove checkstyle error

[ianwdunlop]

remove checkstyle error


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/adb71d45
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/adb71d45
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/adb71d45

Branch: refs/heads/master
Commit: adb71d459adae081de25cb46202c1c4e9cc84f50
Parents: 47182e0
Author: Sagar 
Authored: Tue Jul 19 11:43:10 2016 +0530
Committer: Sagar 
Committed: Tue Jul 19 11:43:10 2016 +0530

--
 .../FavouriteWorkflowsFragment.java | 17 ---
 .../FavouriteWorkflowDetailActivity.java|  8 +++
 .../FavouriteWorkflowDetailFragment.java| 23 ++--
 .../FavouriteWorkflowDetailPresenter.java   |  4 ++--
 4 files changed, 27 insertions(+), 25 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/adb71d45/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflow/FavouriteWorkflowsFragment.java
--
diff --git 
a/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflow/FavouriteWorkflowsFragment.java
 
b/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflow/FavouriteWorkflowsFragment.java
index 9dead78..896462a 100644
--- 
a/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflow/FavouriteWorkflowsFragment.java
+++ 
b/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflow/FavouriteWorkflowsFragment.java
@@ -19,6 +19,13 @@
 package org.apache.taverna.mobile.ui.favouriteworkflow;
 
 
+import org.apache.taverna.mobile.R;
+import org.apache.taverna.mobile.data.DataManager;
+import org.apache.taverna.mobile.data.model.Workflow;
+import org.apache.taverna.mobile.ui.adapter.FavouriteWorkflowsAdapter;
+import org.apache.taverna.mobile.ui.adapter.RecyclerItemClickListner;
+import 
org.apache.taverna.mobile.ui.favouriteworkflowdetail.FavouriteWorkflowDetailActivity;
+
 import android.content.Intent;
 import android.os.Bundle;
 import android.support.design.widget.Snackbar;
@@ -32,20 +39,14 @@ import android.view.ViewGroup;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 
-import org.apache.taverna.mobile.R;
-import org.apache.taverna.mobile.data.DataManager;
-import org.apache.taverna.mobile.data.model.Workflow;
-import org.apache.taverna.mobile.ui.adapter.FavouriteWorkflowsAdapter;
-import org.apache.taverna.mobile.ui.adapter.RecyclerItemClickListner;
-import 
org.apache.taverna.mobile.ui.favouriteworkflowdetail.FavouriteWorkflowDetailActivity;
-
 import java.util.ArrayList;
 import java.util.List;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
 
-public class FavouriteWorkflowsFragment extends Fragment implements 
FavouriteWorkflowsMvpView, RecyclerItemClickListner.OnItemClickListener {
+public class FavouriteWorkflowsFragment extends Fragment
+implements FavouriteWorkflowsMvpView, 
RecyclerItemClickListner.OnItemClickListener {
 
 public final String LOG_TAG = getClass().getSimpleName();
 

http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/adb71d45/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflowdetail/FavouriteWorkflowDetailActivity.java
--
diff --git 
a/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflowdetail/FavouriteWorkflowDetailActivity.java
 
b/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflowdetail/FavouriteWorkflowDetailActivity.java
index 4b4d81c..fd40f4e 100644
--- 
a/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflowdetail/FavouriteWorkflowDetailActivity.java
+++ 
b/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflowdetail/FavouriteWorkflowDetailActivity.java
@@ -19,14 +19,14 @@
 package org.apache.taverna.mobile.ui.favouriteworkflowdetail;
 
 
+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 org.apache.taverna.mobile.R;
-
 import butterknife.BindView;
 import butterknife.ButterKnife;
 
@@ -53,11 +53,11 @@ public class FavouriteWorkflowDetailActivity extends 
AppCompatActivity {
 }
 
 
-
 if (savedInstanceState == null) {
 getSupportFragmentManager().beginTransaction()
 .add(R.id.frame_container
-, 
FavouriteWorkflowDetailFragment.newInstance(getIntent().getStringExtra("id")))
+, FavouriteWorkflowDetailFragment
+
.newInstance(getIntent().getStringExtra("id

[14/19] incubator-taverna-mobile git commit: get image uri from intent

[ianwdunlop]

get image uri from intent


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/979f89a5
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/979f89a5
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/979f89a5

Branch: refs/heads/master
Commit: 979f89a5fceb16657e4d5dfc0723dfcbae900472
Parents: 88c932f
Author: Sagar 
Authored: Mon Jul 25 17:01:48 2016 +0530
Committer: Sagar 
Committed: Mon Jul 25 17:01:48 2016 +0530

--
 .../FavouriteWorkflowDetailFragment.java| 31 +++---
 .../mobile/ui/imagezoom/ImageZoomActivity.java  |  6 +--
 .../mobile/ui/imagezoom/ImageZoomFragment.java  | 43 +---
 .../mobile/ui/imagezoom/ImageZoomMvpView.java   |  2 -
 .../mobile/ui/imagezoom/ImageZoomPresenter.java | 41 ++-
 .../workflowdetail/WorkflowDetailFragment.java  | 30 --
 6 files changed, 60 insertions(+), 93 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/979f89a5/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 6c85593..abfda2b 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
@@ -19,18 +19,6 @@
 package org.apache.taverna.mobile.ui.favouriteworkflowdetail;
 
 
-import com.bumptech.glide.Glide;
-import com.bumptech.glide.load.engine.DiskCacheStrategy;
-
-import org.apache.taverna.mobile.R;
-import org.apache.taverna.mobile.data.DataManager;
-import org.apache.taverna.mobile.data.model.License;
-import org.apache.taverna.mobile.data.model.User;
-import org.apache.taverna.mobile.data.model.Workflow;
-import org.apache.taverna.mobile.ui.imagezoom.ImageZoomActivity;
-import org.apache.taverna.mobile.ui.imagezoom.ImageZoomFragment;
-import org.apache.taverna.mobile.utils.ConnectionInfo;
-
 import android.app.ProgressDialog;
 import android.content.Intent;
 import android.os.Bundle;
@@ -53,6 +41,18 @@ import android.widget.RelativeLayout;
 import android.widget.ScrollView;
 import android.widget.TextView;
 
+import com.bumptech.glide.Glide;
+import com.bumptech.glide.load.engine.DiskCacheStrategy;
+
+import org.apache.taverna.mobile.R;
+import org.apache.taverna.mobile.data.DataManager;
+import org.apache.taverna.mobile.data.model.License;
+import org.apache.taverna.mobile.data.model.User;
+import org.apache.taverna.mobile.data.model.Workflow;
+import org.apache.taverna.mobile.ui.imagezoom.ImageZoomActivity;
+import org.apache.taverna.mobile.ui.imagezoom.ImageZoomFragment;
+import org.apache.taverna.mobile.utils.ConnectionInfo;
+
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
@@ -96,6 +96,8 @@ public class FavouriteWorkflowDetailFragment extends Fragment
 
 private ActionBar actionBar;
 
+private Workflow mWorkflow;
+
 public static FavouriteWorkflowDetailFragment newInstance(String id) {
 
 Bundle args = new Bundle();
@@ -157,7 +159,8 @@ public class FavouriteWorkflowDetailFragment extends 
Fragment
 @OnClick(R.id.ivWorkflowImage)
 void zoomImage(View v) {
 Intent intent = new Intent(getActivity(), ImageZoomActivity.class);
-intent.putExtra(ImageZoomFragment.ID, id);
+intent.putExtra(ImageZoomFragment.JPG_URI, mWorkflow.getPreviewUri());
+intent.putExtra(ImageZoomFragment.SVG_URI, mWorkflow.getSvgUri());
 startActivity(intent);
 }
 
@@ -202,7 +205,7 @@ public class FavouriteWorkflowDetailFragment extends 
Fragment
 
 @Override
 public void showWorkflowDetail(Workflow workflow) {
-
+this.mWorkflow = workflow;
 uploaderName.setText(workflow.getUploader().getContent());
 date.setText(workflow.getUpdatedAt()
 .substring(0, workflow.getUpdatedAt().indexOf(' ')));

http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/979f89a5/app/src/main/java/org/apache/taverna/mobile/ui/imagezoom/ImageZoomActivity.java
--
diff --git 
a/app/src/main/java/org/apache/taverna/mobile/ui/imagezoom/ImageZoomActivity.java
 
b/app/src/main/java/org/apache/taverna/mobile/ui/imagezoom/ImageZoomActivity.java
index 4f594d8..35ef632 100644
--- 
a/app/src/main/java/org/apache/taverna/mobil

[09/19] incubator-taverna-mobile git commit: add image zoom fragment

[ianwdunlop]

add image zoom fragment


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/7d6d86bf
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/7d6d86bf
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/7d6d86bf

Branch: refs/heads/master
Commit: 7d6d86bfa38f3434dff1a94e7c2b5773ea88f307
Parents: cb1384b
Author: Sagar 
Authored: Sun Jul 24 19:25:22 2016 +0530
Committer: Sagar 
Committed: Sun Jul 24 19:25:22 2016 +0530

--
 .../mobile/ui/imagezoom/ImageZoomFragment.java  | 243 +++
 1 file changed, 243 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/7d6d86bf/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
new file mode 100644
index 000..7599e35
--- /dev/null
+++ 
b/app/src/main/java/org/apache/taverna/mobile/ui/imagezoom/ImageZoomFragment.java
@@ -0,0 +1,243 @@
+package org.apache.taverna.mobile.ui.imagezoom;
+
+
+import com.bumptech.glide.Glide;
+import com.bumptech.glide.load.engine.DiskCacheStrategy;
+import com.bumptech.glide.load.resource.drawable.GlideDrawable;
+import com.bumptech.glide.request.Request;
+import com.bumptech.glide.request.animation.GlideAnimation;
+import com.bumptech.glide.request.target.SizeReadyCallback;
+import com.bumptech.glide.request.target.Target;
+
+import org.apache.taverna.mobile.R;
+import org.apache.taverna.mobile.data.DataManager;
+import org.apache.taverna.mobile.utils.ConnectionInfo;
+
+import android.content.Context;
+import android.graphics.Matrix;
+import android.graphics.PointF;
+import android.graphics.drawable.Drawable;
+import android.os.Bundle;
+import android.os.Handler;
+import android.support.annotation.Nullable;
+import android.support.design.widget.Snackbar;
+import android.support.v4.app.Fragment;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.OnClick;
+import uk.co.senab.photoview.PhotoViewAttacher;
+
+public class ImageZoomFragment extends Fragment implements ImageZoomMvpView {
+
+@BindView(R.id.ivWorkflowImage)
+ImageView workflowImage;
+
+@BindView(R.id.ivClose)
+ImageView close;
+
+public static final String ID = "id";
+
+private static final String SERVER_ERROR = "Sever Error. Please try after 
sometime";
+
+private static final String TAG = "ImageZoomFragment";
+
+private String id;
+
+private String jpgURI;
+
+private DataManager dataManager;
+
+private ImageZoomPresenter mImageZoomPresenter;
+
+private ConnectionInfo mConnectionInfo;
+
+PhotoViewAttacher mAttacher;
+
+// These matrices will be used to scale points of the image
+Matrix matrix = new Matrix();
+Matrix savedMatrix = new Matrix();
+
+// The 3 states (events) which the user is trying to perform
+static final int NONE = 0;
+static final int DRAG = 1;
+static final int ZOOM = 2;
+int mode = NONE;
+
+// these PointF objects are used to record the point(s) the user is 
touching
+PointF start = new PointF();
+PointF mid = new PointF();
+float oldDist = 1f;
+
+public static ImageZoomFragment newInstance(String id) {
+
+Bundle args = new Bundle();
+
+args.putString(ID, id);
+
+ImageZoomFragment fragment = new ImageZoomFragment();
+fragment.setArguments(args);
+
+return fragment;
+}
+
+@Override
+public void onCreate(Bundle savedInstanceState) {
+super.onCreate(savedInstanceState);
+
+id = getArguments().getString(ID);
+
+dataManager = new DataManager();
+mImageZoomPresenter = new ImageZoomPresenter(dataManager);
+mConnectionInfo = new ConnectionInfo(getContext());
+}
+
+@Override
+public View onCreateView(LayoutInflater inflater, ViewGroup container, 
Bundle
+savedInstanceState) {
+
+View rootView = inflater.inflate(R.layout.fragment_image_zoom, 
container, false);
+
+ButterKnife.bind(this, rootView);
+
+mImageZoomPresenter.attachView(this);
+
+return rootView;
+}
+
+public void onActivityCreated(@Nullable Bundle savedInstanceState) {
+super.onActivityCreated(savedInstanceState);
+
+if (mConnectionInfo.isConnectingToInternet()) {
+
+mImageZoomPresenter.loadImage(id, workflowImage);
+} else {
+
+showErrorSnackBa

[13/19] incubator-taverna-mobile git commit: remove error

[ianwdunlop]

remove error


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/88c932fc
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/88c932fc
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/88c932fc

Branch: refs/heads/master
Commit: 88c932fca7cf8937b38bf6a28bf9de457269db36
Parents: b131f9e
Author: Sagar 
Authored: Sun Jul 24 22:35:05 2016 +0530
Committer: Sagar 
Committed: Sun Jul 24 22:35:05 2016 +0530

--
 .../apache/taverna/mobile/ui/imagezoom/ImageZoomFragment.java  | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/88c932fc/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 13902b3..75fb36b 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
@@ -243,5 +243,9 @@ public class ImageZoomFragment extends Fragment implements 
ImageZoomMvpView {
 mAttacher = new PhotoViewAttacher(workflowImage);
 }
 
-
+@Override
+public void onDestroyView() {
+super.onDestroyView();
+mImageZoomPresenter.detachView();
+}
 }

[12/19] incubator-taverna-mobile git commit: add licence header

[ianwdunlop]

add licence header


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/b131f9ef
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/b131f9ef
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/b131f9ef

Branch: refs/heads/master
Commit: b131f9efff0981e9bf099511725c24295049c304
Parents: 8dbb7f9
Author: Sagar 
Authored: Sun Jul 24 20:28:57 2016 +0530
Committer: Sagar 
Committed: Sun Jul 24 20:28:57 2016 +0530

--
 .../mobile/ui/imagezoom/ImageZoomActivity.java  | 22 +-
 .../mobile/ui/imagezoom/ImageZoomFragment.java  | 42 ++--
 .../mobile/ui/imagezoom/ImageZoomMvpView.java   | 22 +-
 .../mobile/ui/imagezoom/ImageZoomPresenter.java | 30 +++---
 app/src/main/res/layout/activity_image_zoom.xml | 17 
 app/src/main/res/layout/fragment_image_zoom.xml | 17 
 6 files changed, 128 insertions(+), 22 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/b131f9ef/app/src/main/java/org/apache/taverna/mobile/ui/imagezoom/ImageZoomActivity.java
--
diff --git 
a/app/src/main/java/org/apache/taverna/mobile/ui/imagezoom/ImageZoomActivity.java
 
b/app/src/main/java/org/apache/taverna/mobile/ui/imagezoom/ImageZoomActivity.java
index e642a14..4f594d8 100644
--- 
a/app/src/main/java/org/apache/taverna/mobile/ui/imagezoom/ImageZoomActivity.java
+++ 
b/app/src/main/java/org/apache/taverna/mobile/ui/imagezoom/ImageZoomActivity.java
@@ -1,12 +1,30 @@
+/*
+ * 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.
+ */
 package org.apache.taverna.mobile.ui.imagezoom;
 
 
-import org.apache.taverna.mobile.R;
-
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.v7.app.AppCompatActivity;
 
+import org.apache.taverna.mobile.R;
+
 import butterknife.ButterKnife;
 
 public class ImageZoomActivity extends AppCompatActivity {

http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/b131f9ef/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 0e06ec8..13902b3 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
@@ -1,18 +1,24 @@
+/*
+ * 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.
+ */
 package org.apache.taverna.mobile.ui.imagezoom;
 
 
-import com.bumptech.glide.Glide;
-import com.bumptech.glide.load.engine.DiskCacheStrategy;
-import com.bumptech.glide.load.resource.drawable.GlideDrawable;
-import com.bumptech.glide.request.Request;
-import com.bumptech.glide.request.animation.GlideAnimation;
-import com.bumptech.glide.request.target.SizeReadyCallback;
-import com.bumptech.glide.request.target.Target;
-
-import org.apache.taverna.mobile.R;
-import org.apache.taverna.mobile.data.DataManager;
-import org.apache.taverna.mobile.utils.ConnectionInfo;

[06/19] incubator-taverna-mobile git commit: add presenter for image zoom

[ianwdunlop]

add presenter for image zoom


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/1a62d23b
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/1a62d23b
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/1a62d23b

Branch: refs/heads/master
Commit: 1a62d23b6ccdc2c25cc04c675b087fa4555a2cf4
Parents: 1e01f64
Author: Sagar 
Authored: Sun Jul 24 19:22:14 2016 +0530
Committer: Sagar 
Committed: Sun Jul 24 19:22:14 2016 +0530

--
 .../mobile/ui/imagezoom/ImageZoomMvpView.java   |  19 ++
 .../mobile/ui/imagezoom/ImageZoomPresenter.java | 183 +++
 2 files changed, 202 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/1a62d23b/app/src/main/java/org/apache/taverna/mobile/ui/imagezoom/ImageZoomMvpView.java
--
diff --git 
a/app/src/main/java/org/apache/taverna/mobile/ui/imagezoom/ImageZoomMvpView.java
 
b/app/src/main/java/org/apache/taverna/mobile/ui/imagezoom/ImageZoomMvpView.java
new file mode 100644
index 000..2397691
--- /dev/null
+++ 
b/app/src/main/java/org/apache/taverna/mobile/ui/imagezoom/ImageZoomMvpView.java
@@ -0,0 +1,19 @@
+package org.apache.taverna.mobile.ui.imagezoom;
+
+
+import org.apache.taverna.mobile.ui.base.MvpView;
+
+import android.content.Context;
+
+public interface ImageZoomMvpView extends MvpView{
+
+void showErrorSnackBar(String error);
+
+Context getAppContext();
+
+void setJPGuri(String uri);
+
+void setJPGImage();
+
+void addImageAttacher();
+}

http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/1a62d23b/app/src/main/java/org/apache/taverna/mobile/ui/imagezoom/ImageZoomPresenter.java
--
diff --git 
a/app/src/main/java/org/apache/taverna/mobile/ui/imagezoom/ImageZoomPresenter.java
 
b/app/src/main/java/org/apache/taverna/mobile/ui/imagezoom/ImageZoomPresenter.java
new file mode 100644
index 000..7b5f21b
--- /dev/null
+++ 
b/app/src/main/java/org/apache/taverna/mobile/ui/imagezoom/ImageZoomPresenter.java
@@ -0,0 +1,183 @@
+package org.apache.taverna.mobile.ui.imagezoom;
+
+
+import com.bumptech.glide.GenericRequestBuilder;
+import com.bumptech.glide.Glide;
+import com.bumptech.glide.load.engine.DiskCacheStrategy;
+import com.bumptech.glide.load.model.StreamEncoder;
+import com.bumptech.glide.load.resource.file.FileToStreamDecoder;
+import com.bumptech.glide.request.Request;
+import com.bumptech.glide.request.animation.GlideAnimation;
+import com.bumptech.glide.request.target.SizeReadyCallback;
+import com.bumptech.glide.request.target.Target;
+import com.caverock.androidsvg.SVG;
+
+import org.apache.taverna.mobile.R;
+import org.apache.taverna.mobile.data.DataManager;
+import org.apache.taverna.mobile.data.local.DBHelper;
+import org.apache.taverna.mobile.ui.base.BasePresenter;
+import org.apache.taverna.mobile.utils.SvgDecoder;
+import org.apache.taverna.mobile.utils.SvgDrawableTranscoder;
+
+import android.graphics.drawable.Drawable;
+import android.graphics.drawable.PictureDrawable;
+import android.net.Uri;
+import android.os.Build;
+import android.widget.ImageView;
+
+import java.io.InputStream;
+import java.util.Map;
+
+import rx.Observer;
+import rx.Subscription;
+import rx.android.schedulers.AndroidSchedulers;
+import rx.schedulers.Schedulers;
+
+public class ImageZoomPresenter extends BasePresenter {
+
+private DataManager mDataManager;
+
+private Subscription mSubscriptions;
+
+public static final String NO_IMAGE_URI = "NO Image Found";
+
+public static final String DB_ERROR= "There is some problem. Please try 
after sometime ";
+
+private GenericRequestBuilder 
requestBuilder;
+
+public ImageZoomPresenter(DataManager dataManager) {
+
+mDataManager = dataManager;
+
+}
+
+@Override
+public void attachView(ImageZoomMvpView mvpView) {
+
+super.attachView(mvpView);
+
+requestBuilder = Glide.with(getMvpView().getAppContext())
+.using(Glide.buildStreamModelLoader(Uri.class, 
getMvpView().getAppContext()), InputStream.class)
+.from(Uri.class)
+.as(SVG.class)
+.transcode(new SvgDrawableTranscoder(), PictureDrawable.class)
+.sourceEncoder(new StreamEncoder())
+.cacheDecoder(new FileToStreamDecoder(new SvgDecoder()))
+.decoder(new SvgDecoder())
+.placeholder(R.drawable.placeholder)
+.error(R.drawable.placeholder)
+.override(Target.SIZE_ORIGINAL,Target.SIZE_ORIGINAL)
+.animate(android.R.anim.fade_in);
+
+}
+
+@Override
+public void