You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@taverna.apache.org by ia...@apache.org on 2016/05/04 10:29:35 UTC
incubator-taverna-mobile git commit: Move the actual author name to
its own text view
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 <ia...@manchester.ac.uk>
Authored: Wed May 4 11:28:37 2016 +0100
Committer: Ian Dunlop <ia...@manchester.ac.uk>
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" />
+ <LinearLayout
+ android:orientation="horizontal"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content">
- <TextView android:id="@+id/wkf_author"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:typeface="serif"
- android:textStyle="italic"
- android:text="@string/workflow_author"
- android:textIsSelectable="true"
- android:textAppearance="?android:attr/textAppearanceMedium" />
+ <TextView android:id="@+id/wkf_author"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:typeface="serif"
+ android:textStyle="normal"
+ android:text="@string/workflow_author"
+ android:textIsSelectable="true"
+ android:layout_gravity="center"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:layout_marginRight="5dp" />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:id="@+id/wkf_author_text"
+ android:layout_gravity="center"
+ android:textStyle="bold"
+ android:textAppearance="?android:attr/textAppearanceMedium" />
+ </LinearLayout>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -88,6 +102,10 @@ limitations under the License.
android:minLines="3"
android:hint="@string/description" />
+
+
+
+
<ImageView
android:layout_width="fill_parent"
android:layout_height="wrap_content"
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.
<string name="wktitle">TITLE</string>
<string name="marked">Marked On</string>
<string name="workflow_type_text">Type: %1$s</string>
- <string name="workflow_author">Uploaded by: %1$s</string>
+ <string name="workflow_author">Uploaded by:</string>
<string name="created">Created: %1$s</string>
<string name="modified">Modified :</string>
<string name="description">Workflow Description</string>