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/08/24 13:09:01 UTC
[22/38] incubator-taverna-mobile git commit: Added Usage dialog
Added Usage dialog
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/09ea0635
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/09ea0635
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/09ea0635
Branch: refs/heads/master
Commit: 09ea06359ab7e436886377c7b66c22a2ca82559b
Parents: 817df3f
Author: larrytech7 <la...@gmail.com>
Authored: Thu Aug 13 12:39:42 2015 +0100
Committer: larrytech7 <la...@gmail.com>
Committed: Thu Aug 13 12:39:42 2015 +0100
----------------------------------------------------------------------
.../activities/DashboardMainActivity.java | 7 +-
app/src/main/res/layout/usage_layout.xml | 85 ++++++++++++++++++++
app/src/main/res/layout/workflow_run_item.xml | 3 +-
app/src/main/res/values-large/strings.xml | 9 +++
app/src/main/res/values-sw600dp/strings.xml | 2 +
app/src/main/res/values-w820dp/strings.xml | 5 ++
app/src/main/res/values/strings.xml | 8 ++
7 files changed, 113 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/09ea0635/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 be66716..ba2d67a 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
@@ -132,10 +132,9 @@ public class DashboardMainActivity extends ActionBarActivity
break;
case 3: //show usage
- fragmentManager.beginTransaction()
- .replace(R.id.container, FavoriteFragment.newInstance(position + 1))
- .setTransition(FragmentTransaction.TRANSIT_FRAGMENT_OPEN)
- .commit();
+ aboutDialog.setTitle("USage");
+ aboutDialog.setContentView(R.layout.usage_layout);
+ aboutDialog.show();
break;
case 4: //show about
TextView about = new TextView(getApplicationContext());
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/09ea0635/app/src/main/res/layout/usage_layout.xml
----------------------------------------------------------------------
diff --git a/app/src/main/res/layout/usage_layout.xml b/app/src/main/res/layout/usage_layout.xml
new file mode 100644
index 0000000..0a960c1
--- /dev/null
+++ b/app/src/main/res/layout/usage_layout.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ >
+<LinearLayout
+ android:orientation="vertical"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:padding="10dp">
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textAppearance="?android:attr/textAppearanceLarge"
+ android:text="@string/usage_intro"
+ android:id="@+id/textView16"
+ android:layout_gravity="center_horizontal"
+ android:textSize="25dp"
+ android:textColor="#33b5e5" />
+
+ <TextView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="@string/usage_login_accounts"
+ android:id="@+id/textView17"
+ android:textSize="20dp"
+ android:textColor="#111" />
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textAppearance="?android:attr/textAppearanceLarge"
+ android:text="@string/usage_dashboard"
+ android:id="@+id/textView18"
+ android:layout_gravity="center_horizontal"
+ android:textSize="25dp"
+ android:textColor="#33b5e5" />
+
+ <TextView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="@string/usage_dashboard_Text"
+ android:id="@+id/textView19"
+ android:layout_gravity="center_horizontal"
+ android:textColor="#111"
+ android:textSize="20dp" />
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textAppearance="?android:attr/textAppearanceLarge"
+ android:text="@string/usage_detail"
+ android:id="@+id/textView22"
+ android:layout_gravity="center_horizontal"
+ android:textColor="#33b5e5"
+ android:textSize="25dp" />
+
+ <TextView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:text="@string/usage_detail_text"
+ android:id="@+id/textView23"
+ android:layout_gravity="center_horizontal"
+ android:textSize="20dp" />
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textAppearance="?android:attr/textAppearanceLarge"
+ android:text="@string/usage_menus"
+ android:id="@+id/textView20"
+ android:layout_gravity="center_horizontal"
+ android:textSize="25dp"
+ android:textColor="#33b5e5" />
+
+ <TextView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="@string/usage_menu_Text"
+ android:id="@+id/textView21"
+ android:textSize="20dp" />
+</LinearLayout>
+</ScrollView>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/09ea0635/app/src/main/res/layout/workflow_run_item.xml
----------------------------------------------------------------------
diff --git a/app/src/main/res/layout/workflow_run_item.xml b/app/src/main/res/layout/workflow_run_item.xml
index 9cfab70..ce05d85 100644
--- a/app/src/main/res/layout/workflow_run_item.xml
+++ b/app/src/main/res/layout/workflow_run_item.xml
@@ -107,8 +107,7 @@ limitations under the License.
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceMedium"
android:text="later"
- android:id="@+id/runfinished"
- android:layout_weight="1" />
+ android:id="@+id/runfinished" />
</LinearLayout>
</LinearLayout>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/09ea0635/app/src/main/res/values-large/strings.xml
----------------------------------------------------------------------
diff --git a/app/src/main/res/values-large/strings.xml b/app/src/main/res/values-large/strings.xml
index 3df8fe7..04157a7 100644
--- a/app/src/main/res/values-large/strings.xml
+++ b/app/src/main/res/values-large/strings.xml
@@ -21,4 +21,13 @@ limitations under the License.
<resources>
<string name="completebrand">Powered By Apache Taverna</string>
<string name="play_workflow">Run</string>
+ <string name="usage_login_accounts">When the app is started you are initially prompted with an accounts page to login. Use Your myExperiment account to login. You will need to configure a Taverna player account in the settings when you have successfully logged-in to the app. you can also choose to remain logged-in or not from the login page.</string>
+ <string name="usage_dashboard">Usage | Dashboard</string>
+ <string name="usage_dashboard_Text">Once logged-in to the app, a stream of workflows appears as a stream from which you could view, mark workflows for offline viewing. There are two tabs on the dashboard, the second tab presents a list of marked workflows. there is a menu button the pulls out a navigation drawer menu from the left corner of the dashboard. You can also swipe finger from the extreme left of the screen to pull out the menu. Scrolling to the bottom of the workflow screen will load more workflows. You can pull down to refresh workflows for the initial workflow list. the search bar is used to fetch amongst currently loaded workflows.</string>
+ <string name="usage_menus">Usage | Menus</string>
+
+ <string name="usage_menu_Text">The navigation drawer brings up a menu. The workflow menu item allows one to quickly return to the workflow streams page from any screen. The \'Open Workflow\' item allows users to pick a valid workflow from external storage and run it against a Taverna Server through a Taverna Player. Settings allow user to configure player accounts and portal urls. Logout allows users to log-out of the app</string>
+ <string name="usage_detail">Usage | Workfow Detail</string>
+ <string name="usage_detail_text">The details screen allows users to run particular worklows and provides detailed information about the workflows. Workflows can also be downloaded from here. Workflows can also be marked from this screen which would save much more data for offline use than on the dashboard screen. This screen also provides a set of runs for the workflow from other users</string>
+
</resources>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/09ea0635/app/src/main/res/values-sw600dp/strings.xml
----------------------------------------------------------------------
diff --git a/app/src/main/res/values-sw600dp/strings.xml b/app/src/main/res/values-sw600dp/strings.xml
index 26ada7f..acbb78f 100644
--- a/app/src/main/res/values-sw600dp/strings.xml
+++ b/app/src/main/res/values-sw600dp/strings.xml
@@ -20,4 +20,6 @@ limitations under the License.
-->
<resources>
<string name="completebrand">Powered By Apache Taverna</string>
+ <string name="usage_login_accounts">When the app is started you are initially prompted with an accounts page to login. Use Your myExperiment account to login. You will need to configure a Taverna player account in the settings when you have successfully logged-in to the app. you can also choose to remain logged-in or not from the login page.</string>
+ <string name="usage_dashboard">Usage | Dashboard</string>
</resources>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/09ea0635/app/src/main/res/values-w820dp/strings.xml
----------------------------------------------------------------------
diff --git a/app/src/main/res/values-w820dp/strings.xml b/app/src/main/res/values-w820dp/strings.xml
index 26ada7f..0abd9c2 100644
--- a/app/src/main/res/values-w820dp/strings.xml
+++ b/app/src/main/res/values-w820dp/strings.xml
@@ -20,4 +20,9 @@ limitations under the License.
-->
<resources>
<string name="completebrand">Powered By Apache Taverna</string>
+ <string name="usage_login_accounts">When the app is started you are initially prompted with an accounts page to login. Use Your myExperiment account to login. You will need to configure a Taverna player account in the settings when you have successfully logged-in to the app. you can also choose to remain logged-in or not from the login page.</string>
+ <string name="usage_dashboard">Usage | Dashboard</string>
+ <string name="usage_menu_Text">The navigation drawer brings up a menu. The workflow menu item allows one to quickly return to the workflow streams page from any screen. The \'Open Workflow\' item allows users to pick a valid workflow from external storage and run it against a Taverna Server through a Taverna Player. Settings allow user to configure player accounts and portal urls. Logout allows users to log-out of the app</string>
+ <string name="usage_detail">Usage | Workfow Detail</string>
+ <string name="usage_detail_text">The details screen allows users to run particular worklows and provides detailed information about the workflows. Workflows can also be downloaded from here. Workflows can also be marked from this screen which would save much more data for offline use than on the dashboard screen. This screen also provides a set of runs for the workflow from other users</string>
</resources>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/09ea0635/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 8bed04a..39be676 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -100,5 +100,13 @@ limitations under the License.
<string name="title_activity_run_result">Workflow Run Result</string>
<string name="runstarted">Run Started</string>
<string name="run_finishtime">Run finish Time</string>
+ <string name="usage_intro">Usage | Login</string>
+ <string name="usage_login_accounts">When the app is started you are initially prompted with an accounts page to login. Use Your myExperiment account to login. You will need to configure a Taverna player account in the settings when you have successfully logged-in to the app. you can also choose to remain logged-in or not from the login page.</string>
+ <string name="usage_dashboard">Usage | Dashboard</string>
+ <string name="usage_dashboard_Text">Once logged-in to the app, a stream of workflows appears as a stream from which you could view, mark workflows for offline viewing. There are two tabs on the dashboard, the second tab presents a list of marked workflows. there is a menu button the pulls out a navigation drawer menu from the left corner of the dashboard. You can also swipe finger from the extreme left of the screen to pull out the menu. Scrolling to the bottom of the workflow screen will load more workflows. You can pull down to refresh workflows for the initial workflow list. the search bar is used to fetch amongst currently loaded workflows.</string>
+ <string name="usage_menus">Usage | Menus</string>
+ <string name="usage_menu_Text">The navigation drawer brings up a menu. The workflow menu item allows one to quickly return to the workflow streams page from any screen. The \'Open Workflow\' item allows users to pick a valid workflow from external storage and run it against a Taverna Server through a Taverna Player. Settings allow user to configure player accounts and portal urls. Logout allows users to log-out of the app</string>
+ <string name="usage_detail">Usage | Workfow Detail</string>
+ <string name="usage_detail_text">The details screen allows users to run particular worklows and provides detailed information about the workflows. Workflows can also be downloaded from here. Workflows can also be marked from this screen which would save much more data for offline use than on the dashboard screen. This screen also provides a set of runs for the workflow from other users</string>
</resources>