You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@taverna.apache.org by ia...@apache.org on 2015/06/22 12:28:15 UTC
[03/12] incubator-taverna-mobile git commit: Added author information
to the workflows and run history
Added author information to the workflows and run history
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/324da9ca
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/324da9ca
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/324da9ca
Branch: refs/heads/master
Commit: 324da9ca8ab009feeb5da76567487997a53a7cf1
Parents: 8f0764a
Author: larrytech7 <la...@gmail.com>
Authored: Mon Jun 15 14:48:59 2015 +0100
Committer: larrytech7 <la...@gmail.com>
Committed: Mon Jun 15 14:48:59 2015 +0100
----------------------------------------------------------------------
app/src/main/AndroidManifest.xml | 5 ++---
.../apache/taverna/mobile/adapters/WorkflowAdapter.java | 4 +++-
.../fragments/workflowdetails/WorkflowdetailFragment.java | 2 +-
.../org/apache/taverna/mobile/utils/DetailsLoader.java | 3 ++-
.../taverna/mobile/utils/WorkflowDownloadManager.java | 6 ++++--
.../org/apache/taverna/mobile/utils/WorkflowLoader.java | 10 +++-------
app/src/main/res/layout/fragment_workflow_detail.xml | 3 ++-
app/src/main/res/layout/workflow_item_layout.xml | 5 ++++-
8 files changed, 21 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/324da9ca/app/src/main/AndroidManifest.xml
----------------------------------------------------------------------
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 589e55f..7db3bdb 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -65,9 +65,8 @@ limitations under the License.
<receiver
android:name=".broadcastreceivers.WorkflowDownloadReceiver"
android:enabled="true"
- android:exported="false" >
- <intent-filter
- android:priority="999">
+ android:exported="true" >
+ <intent-filter>
<action android:name="android.intent.action.DOWNLOAD_COMPLETE"/>
</intent-filter>
</receiver>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/324da9ca/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 f53683e..40e1dfa 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
@@ -79,17 +79,19 @@ public class WorkflowAdapter extends RecyclerView.Adapter<WorkflowAdapter.ViewHo
public void onBindViewHolder(final ViewHolder viewHolder, int i) {
final int j = i; //position of workflow item that has workflow data
final Context c = this.context;
+ String author = workflow.get(i).getWorkflow_author();
String title = workflow.get(i).getWorkflow_title();
String description = workflow.get(i).getWorkflow_description();
String desc_full = description;
if(description.length() > 80) description = description.substring(0, 79);
- viewHolder.author_name.setText(workflow.get(i).getWorkflow_author());
+ viewHolder.author_name.setText(author);
viewHolder.wk_title.setText(title);
viewHolder.wk_description.setText( description+" ... ");
final String wkflow_url = workflow.get(j).getWorkflow_remote_url();
final Intent it = new Intent();
it.setClass(context, WorkflowDetailActivity.class);
it.putExtra("workflowid", workflow.get(i).getId());
+ it.putExtra("author", workflow.get(i).getWorkflow_author());
it.putExtra("title",title);
it.putExtra("description",desc_full);
it.putExtra("url", wkflow_url);
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/324da9ca/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 2b23963..2a173c3 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
@@ -162,7 +162,7 @@ public class WorkflowdetailFragment extends Fragment implements View.OnClickList
@Override
public void onLoadFinished(Loader<Workflow> workflowLoader, Workflow workflow) {
TextView author = (TextView) rootView.findViewById(R.id.wkf_author);
- author.setText(workflow.getWorkflow_author());
+ author.append("->"+workflow.getWorkflow_author());
TextView title = (TextView) rootView.findViewById(R.id.wtitle);
title.setText(workflow.getWorkflow_title());
TextView desc = (TextView) rootView.findViewById(R.id.wdescription);
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/324da9ca/app/src/main/java/org/apache/taverna/mobile/utils/DetailsLoader.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/utils/DetailsLoader.java b/app/src/main/java/org/apache/taverna/mobile/utils/DetailsLoader.java
index e18acc7..08d69bf 100644
--- a/app/src/main/java/org/apache/taverna/mobile/utils/DetailsLoader.java
+++ b/app/src/main/java/org/apache/taverna/mobile/utils/DetailsLoader.java
@@ -119,8 +119,9 @@ public class DetailsLoader extends AsyncTaskLoader<Workflow> {
Log.i("JSON ", js.toString(2));
String created_at = js.getString("created_at");
String updated_at = js.getString("updated_at");
+ JSONObject user = js.getJSONObject("user");
workflow = new Workflow(this.context, js.getString("title"),
- "",
+ user.getString("name"),
js.getString("description"),
js.getInt("id"),
js.getString("url"));
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/324da9ca/app/src/main/java/org/apache/taverna/mobile/utils/WorkflowDownloadManager.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/utils/WorkflowDownloadManager.java b/app/src/main/java/org/apache/taverna/mobile/utils/WorkflowDownloadManager.java
index 694e0e8..ea32477 100644
--- a/app/src/main/java/org/apache/taverna/mobile/utils/WorkflowDownloadManager.java
+++ b/app/src/main/java/org/apache/taverna/mobile/utils/WorkflowDownloadManager.java
@@ -88,7 +88,9 @@ public class WorkflowDownloadManager {
request.allowScanningByMediaScanner();
long id = downloadManager.enqueue(request);
- int status = cur.getInt(cur.getColumnIndex(DownloadManager.COLUMN_STATUS));
+ if(id != 0)
+ sendNotification(this.context.getResources().getString(R.string.downloadprogress));
+ /* int status = cur.getInt(cur.getColumnIndex(DownloadManager.COLUMN_STATUS));
switch (status) {
case DownloadManager.STATUS_SUCCESSFUL:
sendNotification(this.context.getResources().getString(R.string.downloadcomplete));
@@ -102,7 +104,7 @@ public class WorkflowDownloadManager {
case DownloadManager.ERROR_FILE_ALREADY_EXISTS:
sendNotification(this.context.getResources().getString(R.string.downloadduplicate));
break;
- }
+ }*/
cur.close();
}
}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/324da9ca/app/src/main/java/org/apache/taverna/mobile/utils/WorkflowLoader.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/utils/WorkflowLoader.java b/app/src/main/java/org/apache/taverna/mobile/utils/WorkflowLoader.java
index e48b337..8c64553 100644
--- a/app/src/main/java/org/apache/taverna/mobile/utils/WorkflowLoader.java
+++ b/app/src/main/java/org/apache/taverna/mobile/utils/WorkflowLoader.java
@@ -97,19 +97,15 @@ public class WorkflowLoader extends AsyncTaskLoader<List<Workflow>> {
for(int i=0; i<jsonWorkflow.length();i++){
JSONObject js = jsonWorkflow.getJSONObject(i);
Log.i("JSON ", js.toString(2));
- //String author = js.getString("author");
+ JSONObject authorJson = js.getJSONObject("user");
String title = js.getString("title");
String description = js.getString("description");
String url = js.getString("url");
long id = js.getLong("id");
- userWorkflows.add(new Workflow(ctx,title," ",description,id,url));
+ userWorkflows.add(new Workflow(ctx,title,">"+authorJson.getString("name"),description,id,url));
}
- } catch (MalformedURLException e) {
- e.printStackTrace();
- } catch (IOException e) {
- e.printStackTrace();
- } catch (JSONException e) {
+ } catch (JSONException | IOException e) {
e.printStackTrace();
}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/324da9ca/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 ffd3313..55aa533 100644
--- a/app/src/main/res/layout/fragment_workflow_detail.xml
+++ b/app/src/main/res/layout/fragment_workflow_detail.xml
@@ -30,7 +30,8 @@ limitations under the License.
android:layout_height="wrap_content"
android:typeface="serif"
android:textStyle="italic"
- android:textSize="20sp" />
+ android:textSize="22sp"
+ android:text="@string/workflow_authorhint" />
<ScrollView
android:layout_width="match_parent"
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/324da9ca/app/src/main/res/layout/workflow_item_layout.xml
----------------------------------------------------------------------
diff --git a/app/src/main/res/layout/workflow_item_layout.xml b/app/src/main/res/layout/workflow_item_layout.xml
index 84ef427..4324bcf 100644
--- a/app/src/main/res/layout/workflow_item_layout.xml
+++ b/app/src/main/res/layout/workflow_item_layout.xml
@@ -61,7 +61,10 @@ limitations under the License.
android:id="@+id/workflow_author"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:text="@string/workflow_authorhint"/>
+ android:text="@string/workflow_authorhint"
+ android:capitalize="characters"
+ android:textColor="#000"
+ android:textSize="22dp" />
<TextView
android:layout_width="wrap_content"