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:13 UTC
[01/12] incubator-taverna-mobile git commit: fixed specific workflow
run history bug. passing the correct id for a given workflow
Repository: incubator-taverna-mobile
Updated Branches:
refs/heads/master a4d52e7b7 -> 419867410
fixed specific workflow run history bug. passing the correct id for a given 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/132b1bd5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/132b1bd5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/132b1bd5
Branch: refs/heads/master
Commit: 132b1bd53ff424d6be7183a030a7ade1eb2a2381
Parents: 313a541
Author: larrytech7 <la...@gmail.com>
Authored: Mon Jun 15 11:49:14 2015 +0100
Committer: larrytech7 <la...@gmail.com>
Committed: Mon Jun 15 11:49:14 2015 +0100
----------------------------------------------------------------------
.../mobile/activities/WorkflowDetailActivity.java | 2 +-
.../workflowdetails/WorkflowRunHistoryFragment.java | 12 ++++++------
.../workflowdetails/WorkflowdetailFragment.java | 2 ++
3 files changed, 9 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/132b1bd5/app/src/main/java/org/apache/taverna/mobile/activities/WorkflowDetailActivity.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/activities/WorkflowDetailActivity.java b/app/src/main/java/org/apache/taverna/mobile/activities/WorkflowDetailActivity.java
index 5fffc27..98c80f8 100644
--- a/app/src/main/java/org/apache/taverna/mobile/activities/WorkflowDetailActivity.java
+++ b/app/src/main/java/org/apache/taverna/mobile/activities/WorkflowDetailActivity.java
@@ -111,7 +111,7 @@ public class WorkflowDetailActivity extends ActionBarActivity {
case 1:
return WorkflowdetailFragment.newInstance(position + 1);
case 2:
- return WorkflowRunHistoryFragment.newInstance("","");
+ return WorkflowRunHistoryFragment.newInstance("workflow",WorkflowdetailFragment.WORKFLO_ID);
case 3:
return WorkflowLicenceFragment.newInstance("","");
case 4:
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/132b1bd5/app/src/main/java/org/apache/taverna/mobile/fragments/workflowdetails/WorkflowRunHistoryFragment.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/fragments/workflowdetails/WorkflowRunHistoryFragment.java b/app/src/main/java/org/apache/taverna/mobile/fragments/workflowdetails/WorkflowRunHistoryFragment.java
index 8c0d9c9..6164a36 100644
--- a/app/src/main/java/org/apache/taverna/mobile/fragments/workflowdetails/WorkflowRunHistoryFragment.java
+++ b/app/src/main/java/org/apache/taverna/mobile/fragments/workflowdetails/WorkflowRunHistoryFragment.java
@@ -60,7 +60,7 @@ public class WorkflowRunHistoryFragment extends Fragment implements LoaderManage
// TODO: Rename and change types of parameters
private String mParam1;
- private String mParam2;
+ private static long workflowID;
/**
* Use this factory method to create a new instance of
@@ -71,11 +71,11 @@ public class WorkflowRunHistoryFragment extends Fragment implements LoaderManage
* @return A new instance of fragment WorkflowRunHistoryFragment.
*/
// TODO: Rename and change types and number of parameters
- public static WorkflowRunHistoryFragment newInstance(String param1, String param2) {
+ public static WorkflowRunHistoryFragment newInstance(String param1, long param2) {
WorkflowRunHistoryFragment fragment = new WorkflowRunHistoryFragment();
Bundle args = new Bundle();
args.putString(ARG_PARAM1, param1);
- args.putString(ARG_PARAM2, param2);
+ args.putLong(ARG_PARAM2, param2);
fragment.setArguments(args);
return fragment;
}
@@ -102,7 +102,7 @@ public class WorkflowRunHistoryFragment extends Fragment implements LoaderManage
runAdapter = new RunAdapter(getActivity(),runsList );
if (getArguments() != null) {
mParam1 = getArguments().getString(ARG_PARAM1);
- mParam2 = getArguments().getString(ARG_PARAM2);
+ workflowID = getArguments().getLong(ARG_PARAM2);
}
}
@@ -114,7 +114,7 @@ public class WorkflowRunHistoryFragment extends Fragment implements LoaderManage
mRecyclerView = (RecyclerView) rootView.findViewById(android.R.id.list);
mRecyclerView.setHasFixedSize(true);
mRecyclerView.setLayoutManager(new LinearLayoutManager(getActivity()));
- getActivity().getLoaderManager().initLoader(1,null,this);
+ getActivity().getLoaderManager().initLoader(1,savedInstanceState,this);
return rootView;
}
@@ -142,7 +142,7 @@ public class WorkflowRunHistoryFragment extends Fragment implements LoaderManage
progressDialog.show();
return new DetailsLoader(getActivity(),
DetailsLoader.LOAD_TYPE.TYPE_RUN_HISTORY,
- 1);
+ workflowID);
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/132b1bd5/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 bb7e0df..2b23963 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
@@ -69,6 +69,7 @@ public class WorkflowdetailFragment extends Fragment implements View.OnClickList
private DownloadManager downloadManager;
View rootView;
private ProgressDialog progressDialog;
+ public static long WORKFLO_ID;
/**
* Returns a new instance of this fragment for the given section
@@ -93,6 +94,7 @@ public class WorkflowdetailFragment extends Fragment implements View.OnClickList
progressDialog = new ProgressDialog(getActivity());
progressDialog.setMessage(getActivity().getResources().getString(R.string.loading));
progressDialog.setCancelable(true);
+ WORKFLO_ID = getActivity().getIntent().getLongExtra("workflowid", 0);
Button download = (Button) rootView.findViewById(R.id.download_wk);
download.setOnClickListener(this);
[03/12] incubator-taverna-mobile git commit: Added author information
to the workflows and run history
Posted by ia...@apache.org.
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"
[11/12] incubator-taverna-mobile git commit: Implemented marking
workflows as favorites for offline use
Posted by ia...@apache.org.
Implemented marking workflows as favorites for offline use
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/a08bc1d5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/a08bc1d5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/a08bc1d5
Branch: refs/heads/master
Commit: a08bc1d51545a6da9b75190d7262226a8a3440ce
Parents: 05a2c71
Author: larrytech7 <la...@gmail.com>
Authored: Wed Jun 17 23:09:19 2015 +0100
Committer: larrytech7 <la...@gmail.com>
Committed: Wed Jun 17 23:09:19 2015 +0100
----------------------------------------------------------------------
.../activities/DashboardMainActivity.java | 8 +---
.../adapters/FavoriteWorkflowAdapter.java | 6 +--
.../mobile/adapters/WorkflowAdapter.java | 42 +++++++++++++++++---
.../main/res/layout/fragment_workflow_about.xml | 1 -
app/src/main/res/menu/dashboard_main.xml | 2 +-
5 files changed, 41 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/a08bc1d5/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 65ad26f..4b69674 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
@@ -53,7 +53,7 @@ import org.apache.taverna.mobile.fragments.WorkflowItemFragment;
import java.io.File;
public class DashboardMainActivity extends ActionBarActivity
- implements NavigationDrawerFragment.NavigationDrawerCallbacks, FavoriteFragment.FavoriteItemSelected {
+ implements NavigationDrawerFragment.NavigationDrawerCallbacks{
/**
* Fragment managing the behaviors, interactions and presentation of the navigation drawer.
@@ -254,12 +254,6 @@ public class DashboardMainActivity extends ActionBarActivity
return super.onOptionsItemSelected(item);
}
- @Override
- public void onFavoriteItemSelected(int position) {
- //trigger when a favorite item is selected.
- startActivity(new Intent(this, WorkflowDetailActivity.class));
- }
-
public class MyAdapter extends FragmentPagerAdapter {
public MyAdapter(FragmentManager fm) {
super(fm);
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/a08bc1d5/app/src/main/java/org/apache/taverna/mobile/adapters/FavoriteWorkflowAdapter.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/adapters/FavoriteWorkflowAdapter.java b/app/src/main/java/org/apache/taverna/mobile/adapters/FavoriteWorkflowAdapter.java
index 29b5e92..517248a 100644
--- a/app/src/main/java/org/apache/taverna/mobile/adapters/FavoriteWorkflowAdapter.java
+++ b/app/src/main/java/org/apache/taverna/mobile/adapters/FavoriteWorkflowAdapter.java
@@ -61,9 +61,9 @@ public class FavoriteWorkflowAdapter extends RecyclerView.Adapter<FavoriteWorkfl
String[] mdata = dataSet.get(i);
fViewHolder.author.setText(mdata[0]);
fViewHolder.title.setText(mdata[1]);
- fViewHolder.dateMarked.setText(mdata[2]);
- fViewHolder.dateAdd.setText(mdata[3]);
- fViewHolder.dateModified.setText(mdata[4]);
+ //fViewHolder.dateMarked.setText(mdata[2]);
+ //fViewHolder.dateAdd.setText(mdata[3]);
+ //fViewHolder.dateModified.setText(mdata[4]);
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/a08bc1d5/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 cc55100..4fa4030 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
@@ -39,6 +39,7 @@ import android.widget.Button;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;
+import android.widget.Toast;
import org.apache.taverna.mobile.R;
import org.apache.taverna.mobile.activities.DashboardMainActivity;
@@ -46,9 +47,13 @@ import org.apache.taverna.mobile.activities.WorkflowDetailActivity;
import org.apache.taverna.mobile.fragments.workflowdetails.WorkflowdetailFragment;
import org.apache.taverna.mobile.tavernamobile.Workflow;
import org.apache.taverna.mobile.utils.WorkflowDownloadManager;
+import org.apache.taverna.mobile.utils.Workflow_DB;
+import org.json.JSONException;
import java.io.File;
+import java.text.SimpleDateFormat;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
/**
@@ -58,10 +63,13 @@ public class WorkflowAdapter extends RecyclerView.Adapter<WorkflowAdapter.ViewHo
private Context context;
private List<Workflow> workflow;
private WorkflowAdapter.ViewHolder mViewHolder;
+ public static final String WORKFLOW_FAVORITE_KEY = "WORKFLOW_FAVORITES";
+ public Workflow_DB favDB;
public WorkflowAdapter(Context c, List<Workflow> wk) {
context = c;
workflow = wk;
+ favDB = new Workflow_DB(context, WORKFLOW_FAVORITE_KEY);
}
public WorkflowAdapter(Context c){
@@ -83,12 +91,20 @@ public class WorkflowAdapter extends RecyclerView.Adapter<WorkflowAdapter.ViewHo
*/
@Override
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();
+
+ final long wid = workflow.get(i).getId();
+ final String author = workflow.get(i).getWorkflow_author();
+ final String title = workflow.get(i).getWorkflow_title();
String description = workflow.get(i).getWorkflow_description();
- String desc_full = description;
+ final String desc_full = description;
+ ArrayList<Object> mfav = new ArrayList<Object>();
+
+ //save current workflow as favorite
+ mfav.add(wid); mfav.add(author);mfav.add(title);mfav.add(desc_full); mfav.add(SimpleDateFormat.getDateTimeInstance().format(new Date()).toString());
+
if(description.length() > 80) description = description.substring(0, 79);
viewHolder.author_name.setText(author);
viewHolder.wk_title.setText(title);
@@ -114,12 +130,12 @@ public class WorkflowAdapter extends RecyclerView.Adapter<WorkflowAdapter.ViewHo
}
});
viewHolder.btn_download_workflow.setOnClickListener(new View.OnClickListener() {
+
@Override
public void onClick(View view) {
-
try {
- String workflow_name = Uri.parse(wkflow_url).getLastPathSegment();
+ //String workflow_name = Uri.parse(wkflow_url).getLastPathSegment();
WorkflowDownloadManager dm = new WorkflowDownloadManager(c);
File destinationFile = new File(PreferenceManager.getDefaultSharedPreferences(c)
.getString(DashboardMainActivity.APP_DIRECTORY_NAME, "/"));
@@ -134,7 +150,16 @@ public class WorkflowAdapter extends RecyclerView.Adapter<WorkflowAdapter.ViewHo
}
}
});
- viewHolder.btn_mark_workflow.setOnClickListener(this);
+ viewHolder.btn_mark_workflow.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View view) {
+ boolean saved = favDB.save();
+ if(saved)
+ Toast.makeText(context,"Workflow marked as favorite",Toast.LENGTH_SHORT).show();
+ else
+ Toast.makeText(context,"Error!, please try again",Toast.LENGTH_SHORT).show();
+ }
+ });
viewHolder.wk_showmore.setText(Html.fromHtml(context.getResources().getString(R.string.seemore)));
viewHolder.wk_showmore.setOnClickListener(new View.OnClickListener() {
@Override
@@ -145,6 +170,11 @@ public class WorkflowAdapter extends RecyclerView.Adapter<WorkflowAdapter.ViewHo
viewHolder.infolayout.setVisibility(View.GONE);
}
});
+ try {
+ favDB.put(mfav);
+ } catch (JSONException e) {
+ e.printStackTrace();
+ }
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/a08bc1d5/app/src/main/res/layout/fragment_workflow_about.xml
----------------------------------------------------------------------
diff --git a/app/src/main/res/layout/fragment_workflow_about.xml b/app/src/main/res/layout/fragment_workflow_about.xml
index 4cab59c..1f7b676 100644
--- a/app/src/main/res/layout/fragment_workflow_about.xml
+++ b/app/src/main/res/layout/fragment_workflow_about.xml
@@ -22,7 +22,6 @@ limitations under the License.
android:layout_height="match_parent"
tools:context="org.apache.taverna.mobile.fragments.workflowdetails.WorkflowAboutFragment">
- <!-- TODO: Update blank fragment layout -->
<TextView android:layout_width="match_parent"
android:layout_height="match_parent"
android:text="@string/hello_blank_fragment"
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/a08bc1d5/app/src/main/res/menu/dashboard_main.xml
----------------------------------------------------------------------
diff --git a/app/src/main/res/menu/dashboard_main.xml b/app/src/main/res/menu/dashboard_main.xml
index 48a0e82..d272ee7 100644
--- a/app/src/main/res/menu/dashboard_main.xml
+++ b/app/src/main/res/menu/dashboard_main.xml
@@ -25,6 +25,6 @@ limitations under the License.
<item android:id="@+id/action_search"
android:title="@string/menu_search"
android:icon="@android:drawable/ic_menu_search"
- app:showAsAction="always|withText"
+ app:showAsAction="collapseActionView|always"
app:actionViewClass="android.support.v7.widget.SearchView"/>
</menu>
[05/12] incubator-taverna-mobile git commit: Implemented running
workflows over Taverna Player. Fixed downloading workflow indicator
Posted by ia...@apache.org.
Implemented running workflows over Taverna Player. Fixed downloading workflow indicator
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/78ee0be7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/78ee0be7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/78ee0be7
Branch: refs/heads/master
Commit: 78ee0be76ba3befd6433319ac33e9258ff08a8ce
Parents: 4f660cb
Author: larrytech7 <la...@gmail.com>
Authored: Tue Jun 16 12:56:37 2015 +0100
Committer: larrytech7 <la...@gmail.com>
Committed: Tue Jun 16 12:56:37 2015 +0100
----------------------------------------------------------------------
.../activities/DashboardMainActivity.java | 9 +-
.../WorkflowDownloadReceiver.java | 4 +-
.../mobile/fragments/WorkflowItemFragment.java | 50 ++--
.../workflowdetails/WorkflowdetailFragment.java | 238 ++++++++++++++++++-
.../mobile/tavernamobile/TavernaPlayerAPI.java | 2 +-
.../mobile/utils/WorkflowDownloadManager.java | 4 +-
app/src/main/res/layout/fragment_item_grid.xml | 7 +-
app/src/main/res/layout/fragment_item_list.xml | 2 +-
app/src/main/res/values/strings.xml | 1 +
9 files changed, 267 insertions(+), 50 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/78ee0be7/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 35a073d..5ff0640 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
@@ -56,7 +56,7 @@ import org.apache.taverna.mobile.fragments.WorkflowItemFragment;
import java.io.File;
public class DashboardMainActivity extends ActionBarActivity
- implements NavigationDrawerFragment.NavigationDrawerCallbacks, WorkflowItemFragment.OnWorkflowSelectedListener, FavoriteFragment.FavoriteItemSelected {
+ implements NavigationDrawerFragment.NavigationDrawerCallbacks, FavoriteFragment.FavoriteItemSelected {
/**
* Fragment managing the behaviors, interactions and presentation of the navigation drawer.
@@ -252,13 +252,6 @@ public class DashboardMainActivity extends ActionBarActivity
}
@Override
- public void onWorkflowSelected(int id) {
- //send all details to the next Activity which should display the Workflow details in full
- startActivity(new Intent(this, WorkflowDetailActivity.class));
-
- }
-
- @Override
public void onFavoriteItemSelected(int position) {
//trigger when a favorite item is selected.
startActivity(new Intent(this, WorkflowDetailActivity.class));
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/78ee0be7/app/src/main/java/org/apache/taverna/mobile/broadcastreceivers/WorkflowDownloadReceiver.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/broadcastreceivers/WorkflowDownloadReceiver.java b/app/src/main/java/org/apache/taverna/mobile/broadcastreceivers/WorkflowDownloadReceiver.java
index 8bc2468..0657b46 100644
--- a/app/src/main/java/org/apache/taverna/mobile/broadcastreceivers/WorkflowDownloadReceiver.java
+++ b/app/src/main/java/org/apache/taverna/mobile/broadcastreceivers/WorkflowDownloadReceiver.java
@@ -47,11 +47,11 @@ public class WorkflowDownloadReceiver extends BroadcastReceiver {
query.setFilterById(receivedID);
Cursor cur = mgr.query(query);
int index = cur.getColumnIndex(DownloadManager.COLUMN_STATUS);
- String workflow = cur.getString(cur.getColumnIndex(DownloadManager.COLUMN_LOCAL_FILENAME));
+// String workflow = cur.getString(cur.getColumnIndex(DownloadManager.COLUMN_LOCAL_FILENAME));
if(cur.moveToFirst()) {
if(cur.getInt(index) == DownloadManager.STATUS_SUCCESSFUL){
- wdm.sendNotification(workflow+context.getResources().getString(R.string.downloadcomplete));
+ wdm.sendNotification(context.getResources().getString(R.string.downloadcomplete));
}else{
wdm.sendNotification(context.getResources().getString(R.string.downloadfailed));
}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/78ee0be7/app/src/main/java/org/apache/taverna/mobile/fragments/WorkflowItemFragment.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/fragments/WorkflowItemFragment.java b/app/src/main/java/org/apache/taverna/mobile/fragments/WorkflowItemFragment.java
index 5793b33..49acbe5 100644
--- a/app/src/main/java/org/apache/taverna/mobile/fragments/WorkflowItemFragment.java
+++ b/app/src/main/java/org/apache/taverna/mobile/fragments/WorkflowItemFragment.java
@@ -56,8 +56,6 @@ import java.util.List;
* Large screen devices (such as tablets) are supported by replacing the ListView
* with a GridView.
* <p/>
- * Activities containing this fragment MUST implement the {@link org.apache.taverna.mobile.fragments.WorkflowItemFragment.OnWorkflowSelectedListener}
- * interface.
*/
public class WorkflowItemFragment extends Fragment implements android.app.LoaderManager.LoaderCallbacks<List<Workflow>>, SwipeRefreshLayout.OnRefreshListener {
@@ -72,8 +70,6 @@ public class WorkflowItemFragment extends Fragment implements android.app.Loader
private String mParam1;
private String mParam2;
- private OnWorkflowSelectedListener mListener;
-
/**
* The fragment's ListView/GridView.
*/
@@ -133,12 +129,11 @@ public class WorkflowItemFragment extends Fragment implements android.app.Loader
mListView = (RecyclerView) view.findViewById(android.R.id.list);
mListView.setHasFixedSize(true);
mListView.setLayoutManager(new LinearLayoutManager(getActivity()));
- getActivity().getLoaderManager().initLoader(0,null,this);
if(workflowAdapter.getItemCount() == 0){
setEmptyText("No Workflows available");
- mListView.swapAdapter(workflowAdapter, false);
+ mListView.swapAdapter(workflowAdapter, true);
}else {
- mListView.setAdapter(workflowAdapter);
+ mListView.swapAdapter(workflowAdapter,true);
mListView.setAnimation(in);
}
return view;
@@ -148,13 +143,26 @@ public class WorkflowItemFragment extends Fragment implements android.app.Loader
public void onAttach(Activity activity) {
super.onAttach(activity);
try {
- mListener = (OnWorkflowSelectedListener) activity;
+
((DashboardMainActivity) activity).onSectionAttached(1);
} catch (ClassCastException e) {
throw new ClassCastException(activity.toString()
+ " must implement OnFragmentInteractionListener");
}
}
+
+ /**
+ * Called when the fragment is visible to the user and actively running.
+ * This is generally
+ * tied to {@link android.app.Activity#onResume() Activity.onResume} of the containing
+ * Activity's lifecycle.
+ */
+ @Override
+ public void onResume() {
+ super.onResume();
+ getActivity().getLoaderManager().initLoader(0,null,this);
+ }
+
/**
* Initialize the contents of the Activity's standard options menu. You
* should place your menu items in to <var>menu</var>. For this method
@@ -209,7 +217,6 @@ public class WorkflowItemFragment extends Fragment implements android.app.Loader
@Override
public void onDetach() {
super.onDetach();
- mListener = null;
}
/**
@@ -241,37 +248,20 @@ public class WorkflowItemFragment extends Fragment implements android.app.Loader
@Override
public void onLoadFinished(android.content.Loader<List<Workflow>> loader, List<Workflow> workflows) {
swipeRefreshLayout.setRefreshing(false);
- loader.stopLoading();
workflowAdapter = new WorkflowAdapter(getActivity(), workflows);
- if(workflows.size() > 0)
- mListView.swapAdapter(workflowAdapter, true);
+ mListView.swapAdapter(workflowAdapter, true);
}
@Override
public void onLoaderReset(android.content.Loader<List<Workflow>> listLoader) {
- listLoader.reset();
- mListView.swapAdapter(null, false);
+ //listLoader.reset();
+// mListView.swapAdapter(null, true);
}
@Override
public void onRefresh() {
- getActivity().getLoaderManager().initLoader(0,null,this);
- }
-
- /**
- * This interface must be implemented by activities that contain this
- * fragment to allow an interaction in this fragment to be communicated
- * to the activity and potentially other fragments contained in that
- * activity.
- * <p/>
- * See the Android Training lesson <a href=
- * "http://developer.android.com/training/basics/fragments/communicating.html"
- * >Communicating with Other Fragments</a> for more information.
- */
- public interface OnWorkflowSelectedListener {
- // TODO: Update argument type and name
- public void onWorkflowSelected(int workflowPosition);
+ getActivity().getLoaderManager().restartLoader(0, null, this);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/78ee0be7/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 2a173c3..656ea90 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
@@ -25,36 +25,54 @@ package org.apache.taverna.mobile.fragments.workflowdetails;
*/
import android.app.Activity;
+import android.app.AlertDialog;
import android.app.DownloadManager;
import android.app.LoaderManager;
import android.app.ProgressDialog;
import android.content.Context;
+import android.content.DialogInterface;
import android.content.Intent;
import android.content.Loader;
import android.database.Cursor;
import android.media.Image;
import android.net.Uri;
+import android.os.AsyncTask;
import android.os.Bundle;
import android.os.Environment;
import android.preference.PreferenceManager;
import android.support.annotation.Nullable;
import android.support.v4.app.Fragment;
+import android.util.Base64;
+import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.Button;
+import android.widget.EditText;
import android.widget.ImageView;
+import android.widget.LinearLayout;
import android.widget.TextView;
import android.widget.Toast;
import org.apache.taverna.mobile.R;
import org.apache.taverna.mobile.activities.DashboardMainActivity;
+import org.apache.taverna.mobile.tavernamobile.TavernaPlayerAPI;
import org.apache.taverna.mobile.tavernamobile.Workflow;
import org.apache.taverna.mobile.utils.DetailsLoader;
import org.apache.taverna.mobile.utils.WorkflowDownloadManager;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
import org.w3c.dom.Text;
+import java.io.BufferedReader;
+import java.io.DataOutputStream;
import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.HttpURLConnection;
+import java.net.URL;
import java.util.prefs.PreferenceChangeEvent;
/**
@@ -69,6 +87,9 @@ public class WorkflowdetailFragment extends Fragment implements View.OnClickList
private DownloadManager downloadManager;
View rootView;
private ProgressDialog progressDialog;
+ public AlertDialog runDialog;
+ public AlertDialog.Builder alertDialogBuilder;
+ private String download_url;
public static long WORKFLO_ID;
/**
@@ -89,13 +110,15 @@ public class WorkflowdetailFragment extends Fragment implements View.OnClickList
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
-
+ long workflowid = getActivity().getIntent().getLongExtra("workflowid", 0);
rootView = inflater.inflate(R.layout.fragment_workflow_detail, container, false);
progressDialog = new ProgressDialog(getActivity());
progressDialog.setMessage(getActivity().getResources().getString(R.string.loading));
progressDialog.setCancelable(true);
- WORKFLO_ID = getActivity().getIntent().getLongExtra("workflowid", 0);
+ WORKFLO_ID = workflowid;
+ Button createRun = (Button) rootView.findViewById(R.id.run_wk);
+ createRun.setOnClickListener(this);
Button download = (Button) rootView.findViewById(R.id.download_wk);
download.setOnClickListener(this);
downloadManager = (DownloadManager) getActivity().getSystemService(Context.DOWNLOAD_SERVICE);
@@ -118,6 +141,7 @@ public class WorkflowdetailFragment extends Fragment implements View.OnClickList
switch(view.getId()){
case R.id.run_wk:
//TODO implement functionality to issue a run request to the Taverna PLAYER to run the current workflow
+ new WorkflowRunTask(getActivity()).execute(""+WORKFLO_ID);
break;
case R.id.download_wk:
// start the android Download manager to start downloading a remote workflow file
@@ -125,7 +149,7 @@ public class WorkflowdetailFragment extends Fragment implements View.OnClickList
try {
dmgr.downloadWorkflow(new File(PreferenceManager.getDefaultSharedPreferences(getActivity()).getString(
DashboardMainActivity.APP_DIRECTORY_NAME, "/")),
- "");
+ download_url);
} catch (Exception e) {
e.printStackTrace();
}
@@ -162,7 +186,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.append("->"+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);
@@ -173,6 +197,7 @@ public class WorkflowdetailFragment extends Fragment implements View.OnClickList
updated.append(workflow.getWorkflow_datemodified());
// ImageView preview = (ImageView) rootView.findViewById(R.id.wkf_image);
// preview.setImageURI(Uri.parse(workflow.getWorkflow_remote_url()));
+ download_url =workflow.getWorkflow_remote_url();
// progressDialog.cancel();
progressDialog.dismiss();
}
@@ -181,4 +206,209 @@ public class WorkflowdetailFragment extends Fragment implements View.OnClickList
public void onLoaderReset(Loader<Workflow> workflowLoader) {
workflowLoader.reset();
}
+
+ //create and return a new TextView
+ public TextView createTextView(Context mcontetx, String placeholder){
+ TextView tv = new TextView(mcontetx);
+ tv.setText(placeholder);
+ tv.setMinLines(2);
+
+ return tv;
+ }
+
+ //create and return a new EdiText view
+ public EditText createEditText(Context ctx, int i){
+ EditText edt;
+ edt = new EditText(ctx);
+ edt.setHint("Enter Value");
+ edt.setMinLines(2);
+ edt.setId(i);
+ return edt;
+ }
+//fetch and compute the framework on which the run inputs are to be built and entered
+ private class WorkflowRunTask extends AsyncTask<String, Void, String>{
+
+ private Context context;
+
+ private WorkflowRunTask(Context context) {
+ this.context = context;
+ }
+
+ @Override
+ protected void onPreExecute() {
+ super.onPreExecute();
+ progressDialog.setMessage(this.context.getResources().getString(R.string.fetchrun));
+ progressDialog.show();
+ }
+
+ @Override
+ protected String doInBackground(String... params) {
+ StringBuffer sb = new StringBuffer();
+ try {
+
+ URL workflowurl = new URL(TavernaPlayerAPI.PLAYER_RUN_FRAMEWORK_URL+params[0]);
+ HttpURLConnection connection = (HttpURLConnection) workflowurl.openConnection();
+ String userpass = "icep603@gmail.com" + ":" + "creationfox";
+ String basicAuth = "Basic " + Base64.encodeToString(userpass.getBytes(), Base64.DEFAULT);
+
+ connection.setRequestProperty("Authorization", basicAuth);
+ connection.setRequestProperty("Accept", "application/json");
+ connection.setRequestMethod("GET");
+ // connection.setDoInput(true);
+ // connection.setDoOutput(true);
+ connection.connect(); //send request
+ Log.i("RESPONSE Code", "" + connection.getResponseCode());
+ Log.i("RESPONSE Messsage", "" + connection.getResponseMessage());
+ Log.i("Authorization ", "" + connection.getRequestProperty("Authorization"));
+
+ InputStream dis = connection.getInputStream();
+ BufferedReader br = new BufferedReader(new InputStreamReader(dis));
+
+ String jsonData = "";
+ while ((jsonData = br.readLine()) != null) {
+ sb.append(jsonData);
+ }
+ dis.close();
+ br.close();
+ return sb.toString();
+
+ }catch (IOException ex){
+ ex.printStackTrace();
+ }
+ return sb.toString();
+ }
+
+ @Override
+ protected void onPostExecute(String result) {
+ //show the skeleton to the user in a dialog box
+ final Context ctx = this.context;
+ final LinearLayout ll = new LinearLayout(ctx);
+ ll.setOrientation(LinearLayout.VERTICAL);
+
+ try {
+ final JSONObject json = new JSONObject(result); //main server response json
+ JSONObject mjson = json.getJSONObject("run"); //main framework response json
+ String name = mjson.getString("name"); //a name that can be configured or edited for the new run to be created
+ ll.addView(createTextView(ctx, name));
+ final JSONArray attr_array = mjson.getJSONArray("inputs_attributes");
+ for(int i=0; i<attr_array.length(); i++){
+ JSONObject obj = attr_array.getJSONObject(i);
+ ll.addView(createTextView(ctx, obj.getString("name")));
+ ll.addView(createEditText(ctx, i));
+ }
+
+ alertDialogBuilder = new AlertDialog.Builder(ctx);
+ alertDialogBuilder.setView(ll);
+ // alertDialogBuilder.setMessage(result);
+ alertDialogBuilder.setIcon(ctx.getResources().getDrawable(R.mipmap.ic_launcher));
+ alertDialogBuilder.setTitle("New Run");
+ alertDialogBuilder.setPositiveButton("Execute", new DialogInterface.OnClickListener() {
+ @Override
+ public void onClick(DialogInterface dialogInterface, int i) {
+ int n = attr_array.length();
+ for(int j=0; j<n; j++){
+ try {
+ EditText inputText = (EditText) ll.findViewById(j);
+ String value = inputText.getText().toString();//get input entry entered by the user
+ JSONObject jojb = attr_array.getJSONObject(j); //get the input attributes provided by the skeleton
+ jojb.put("value", value); //replace value field in object with the entry provided by the user
+ attr_array.put(j, jojb); //replace the input entry with the new name/input json object
+
+ } catch (JSONException e) {
+ e.printStackTrace();
+ }
+
+ }
+ try {
+ json.put("inputs_attributes", attr_array);
+ Log.i("RUN FRAMEWORK", json.toString(2));
+ new RunTask(ctx).execute(json.toString());
+ } catch (JSONException e) {
+ e.printStackTrace();
+ }
+
+ }
+ });
+ alertDialogBuilder.setNegativeButton("Cancel", new DialogInterface.OnClickListener() {
+
+ @Override
+ public void onClick(DialogInterface dialogInterface, int i) {
+ dialogInterface.dismiss();
+ }
+ });
+
+ runDialog = alertDialogBuilder.create();
+
+ } catch (JSONException e) {
+ e.printStackTrace();
+ }
+ progressDialog.dismiss();
+
+ runDialog.show();
+ }
+ }
+ //Send request for the execution of a run on the server through the player
+ private class RunTask extends AsyncTask<String, Void, String>{
+
+ private Context context;
+
+ private RunTask(Context ctx) {
+ this.context = ctx;
+ }
+
+ @Override
+ protected void onPreExecute() {
+ super.onPreExecute();
+ }
+
+ @Override
+ protected String doInBackground(String... params) {
+ StringBuffer sb = new StringBuffer();
+ try {
+
+ URL workflowurl = new URL(TavernaPlayerAPI.PLAYER_RUN_URL);
+ HttpURLConnection connection = (HttpURLConnection) workflowurl.openConnection();
+ String userpass = "icep603@gmail.com" + ":" + "creationfox";
+ String basicAuth = "Basic " + Base64.encodeToString(userpass.getBytes(), Base64.DEFAULT);
+
+ connection.setRequestProperty("Authorization", basicAuth);
+ connection.setRequestProperty("Accept", "application/json");
+ connection.setRequestProperty("Content-Type", "application/json");
+ connection.setRequestMethod("POST");
+ // connection.setDoInput(true);
+ // connection.setDoOutput(true);
+ connection.connect(); //send request
+
+ DataOutputStream dos = new DataOutputStream(connection.getOutputStream());
+ dos.writeBytes(params[0]);//write post data which is a formatted json data representing inputs to a run
+ //dos.writeUTF("");
+ dos.flush();
+ dos.close();
+
+ InputStream dis = connection.getInputStream();
+ BufferedReader br = new BufferedReader(new InputStreamReader(dis));
+
+ String jsonData = "";
+ while ((jsonData = br.readLine()) != null) {
+ sb.append(jsonData);
+ }
+ dis.close();
+ br.close();
+ Log.i("RESPONSE Code", "" + connection.getResponseCode());
+ Log.i("RESPONSE Messsage", "" + connection.getResponseMessage());
+ Log.i("Authorization ", "" + connection.getRequestProperty("Authorization"));
+
+ return sb.toString();
+
+ }catch (IOException ex){
+ ex.printStackTrace();
+ }
+ return sb.toString();
+ }
+
+ @Override
+ protected void onPostExecute(String s) {
+ Log.i("RUN OutPut", s);
+ }
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/78ee0be7/app/src/main/java/org/apache/taverna/mobile/tavernamobile/TavernaPlayerAPI.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/tavernamobile/TavernaPlayerAPI.java b/app/src/main/java/org/apache/taverna/mobile/tavernamobile/TavernaPlayerAPI.java
index d3e1e40..85874a8 100644
--- a/app/src/main/java/org/apache/taverna/mobile/tavernamobile/TavernaPlayerAPI.java
+++ b/app/src/main/java/org/apache/taverna/mobile/tavernamobile/TavernaPlayerAPI.java
@@ -11,7 +11,7 @@ public class TavernaPlayerAPI {
public static final String SERVER_BASE_URL = "http://heater.cs.man.ac.uk:8090/taverna-2.5.4/";
public static final String PLAYER_WORKFLOW_URL = PLAYER_BASE_URL+"workflows/";
public static final String PLAYER_RUN_URL = PLAYER_BASE_URL+"runs/";
- public static final String PLAYER_RUN_IMAGE_URL = PLAYER_RUN_URL+"new?workflow_id="; //returns a json 'framework' used for creating runs for the given workflow
+ public static final String PLAYER_RUN_FRAMEWORK_URL = PLAYER_RUN_URL+"new?workflow_id="; //returns a json 'framework' used for creating runs for the given workflow
public TavernaPlayerAPI() {
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/78ee0be7/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 ea32477..8364e42 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
@@ -85,9 +85,9 @@ public class WorkflowDownloadManager {
request.setDestinationUri(destinationurl);
request.setNotificationVisibility(DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED |
DownloadManager.Request.VISIBILITY_VISIBLE);
- request.allowScanningByMediaScanner();
- long id = downloadManager.enqueue(request);
+ long id = this.downloadManager.enqueue(request);
+
if(id != 0)
sendNotification(this.context.getResources().getString(R.string.downloadprogress));
/* int status = cur.getInt(cur.getColumnIndex(DownloadManager.COLUMN_STATUS));
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/78ee0be7/app/src/main/res/layout/fragment_item_grid.xml
----------------------------------------------------------------------
diff --git a/app/src/main/res/layout/fragment_item_grid.xml b/app/src/main/res/layout/fragment_item_grid.xml
index 82d8c0d..31600d2 100644
--- a/app/src/main/res/layout/fragment_item_grid.xml
+++ b/app/src/main/res/layout/fragment_item_grid.xml
@@ -22,7 +22,10 @@ limitations under the License.
<!-- <GridView android:id="@+id/gridlist"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:numColumns="2">-->
+ android:numColumns="2">--> <android.support.v4.widget.SwipeRefreshLayout
+ android:id="@+id/refresh"
+ android:layout_height="match_parent"
+ android:layout_width="match_parent">
<android.support.v7.widget.RecyclerView
xmlns:recycler_view="http://schemas.android.com/apk/res-auto"
android:id="@android:id/list"
@@ -32,7 +35,7 @@ limitations under the License.
android:background="@color/button_material_light"
></android.support.v7.widget.RecyclerView>
<!-- </GridView>-->
-
+</android.support.v4.widget.SwipeRefreshLayout>
<TextView android:id="@android:id/empty"
android:layout_width="match_parent"
android:layout_height="match_parent"
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/78ee0be7/app/src/main/res/layout/fragment_item_list.xml
----------------------------------------------------------------------
diff --git a/app/src/main/res/layout/fragment_item_list.xml b/app/src/main/res/layout/fragment_item_list.xml
index 9852dfb..19aa79e 100644
--- a/app/src/main/res/layout/fragment_item_list.xml
+++ b/app/src/main/res/layout/fragment_item_list.xml
@@ -36,7 +36,7 @@ limitations under the License.
android:id="@android:id/list"
android:theme="@style/Theme.AppCompat.Light"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
+ android:layout_height="match_parent"
android:background="@color/button_material_light"
>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/78ee0be7/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 e7b2221..e9ac67c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -79,5 +79,6 @@ limitations under the License.
<string name="seemore"> See more &raquo</string>
<string name="loading">Loading details</string>
<string name="loadworkflows">Loading Workflows</string>
+ <string name="fetchrun">Fetching run components </string>
</resources>
[10/12] incubator-taverna-mobile git commit: implemented workflow
search by author and title
Posted by ia...@apache.org.
implemented workflow search by author and title
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/05a2c718
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/05a2c718
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/05a2c718
Branch: refs/heads/master
Commit: 05a2c718c401be3287d96c3da4830f954df09de2
Parents: 334e7ff
Author: larrytech7 <la...@gmail.com>
Authored: Wed Jun 17 02:04:53 2015 +0100
Committer: larrytech7 <la...@gmail.com>
Committed: Wed Jun 17 02:04:53 2015 +0100
----------------------------------------------------------------------
app/build.gradle | 3 +-
.../r/debug/org/apache/taverna/mobile/R.java | 210 ++++++++++---------
.../debug/org/apache/taverna/mobile/R$id.class | Bin 5255 -> 5326 bytes
.../org/apache/taverna/mobile/R$integer.class | Bin 540 -> 540 bytes
.../org/apache/taverna/mobile/R$layout.class | Bin 2386 -> 2386 bytes
.../org/apache/taverna/mobile/R$menu.class | Bin 493 -> 493 bytes
.../org/apache/taverna/mobile/R$mipmap.class | Bin 861 -> 902 bytes
.../org/apache/taverna/mobile/R$string.class | Bin 3169 -> 3764 bytes
.../org/apache/taverna/mobile/R$style.class | Bin 15948 -> 15948 bytes
.../org/apache/taverna/mobile/R$styleable.class | Bin 16512 -> 16512 bytes
.../debug/org/apache/taverna/mobile/R$xml.class | Bin 412 -> 484 bytes
.../debug/org/apache/taverna/mobile/R.class | Bin 1193 -> 1193 bytes
.../DashboardMainActivity$MyAdapter.class | Bin 1983 -> 1983 bytes
.../activities/DashboardMainActivity.class | Bin 9936 -> 8789 bytes
.../activities/FlashScreenActivity$1.class | Bin 1005 -> 1499 bytes
.../mobile/activities/FlashScreenActivity.class | Bin 1553 -> 2524 bytes
.../mobile/activities/LoginActivity$1.class | Bin 0 -> 261 bytes
.../LoginActivity$LoginFragment$LoginTask.class | Bin 0 -> 5533 bytes
.../LoginActivity$LoginFragment.class | Bin 1935 -> 3446 bytes
.../mobile/activities/LoginActivity.class | Bin 1740 -> 1806 bytes
.../mobile/activities/SettingsActivity$1.class | Bin 0 -> 1445 bytes
...ingsActivity$GeneralPreferenceFragment.class | Bin 0 -> 1156 bytes
.../mobile/activities/SettingsActivity.class | Bin 0 -> 4407 bytes
...lowDetailActivity$SectionsPagerAdapter.class | Bin 2615 -> 2640 bytes
.../activities/WorkflowDetailActivity.class | Bin 2253 -> 2171 bytes
.../mobile/adapters/RunAdapter$RunHolder.class | Bin 1141 -> 1141 bytes
.../adapters/SliderMenuAdapter$ViewHolder.class | Bin 911 -> 911 bytes
.../mobile/adapters/SliderMenuAdapter.class | Bin 2670 -> 2720 bytes
.../mobile/adapters/WorkflowAdapter$1.class | Bin 1461 -> 1461 bytes
.../mobile/adapters/WorkflowAdapter$2.class | Bin 2670 -> 2670 bytes
.../mobile/adapters/WorkflowAdapter$3.class | Bin 1418 -> 1418 bytes
.../adapters/WorkflowAdapter$ViewHolder.class | Bin 1506 -> 1506 bytes
.../mobile/adapters/WorkflowAdapter.class | Bin 5998 -> 6594 bytes
.../WorkflowDownloadReceiver.class | Bin 2533 -> 2256 bytes
.../fragments/NavigationDrawerFragment$2.class | Bin 1600 -> 1600 bytes
.../fragments/NavigationDrawerFragment$3.class | Bin 1044 -> 1044 bytes
.../fragments/NavigationDrawerFragment.class | Bin 7886 -> 7909 bytes
.../mobile/fragments/WorkflowItemFragment.class | Bin 8056 -> 9930 bytes
.../WorkflowRunHistoryFragment.class | Bin 6168 -> 6252 bytes
.../WorkflowdetailFragment$1.class | Bin 0 -> 318 bytes
.../WorkflowdetailFragment$RunTask.class | Bin 0 -> 4935 bytes
...rkflowdetailFragment$WorkflowRunTask$1.class | Bin 0 -> 3359 bytes
...rkflowdetailFragment$WorkflowRunTask$2.class | Bin 0 -> 1309 bytes
...WorkflowdetailFragment$WorkflowRunTask.class | Bin 0 -> 7730 bytes
.../WorkflowdetailFragment.class | Bin 6905 -> 8969 bytes
.../TavernaPlayerAPI$Authenticator.class | Bin 926 -> 926 bytes
.../mobile/tavernamobile/TavernaPlayerAPI.class | Bin 935 -> 2240 bytes
.../taverna/mobile/utils/DetailsLoader.class | Bin 6725 -> 6834 bytes
.../mobile/utils/WorkflowDownloadManager.class | Bin 5031 -> 4772 bytes
.../taverna/mobile/utils/WorkflowLoader.class | Bin 5613 -> 5583 bytes
app/build/intermediates/dex/debug/classes.dex | Bin 2147300 -> 2162936 bytes
.../incremental/mergeResources/debug/merger.xml | 6 +-
.../manifests/full/debug/AndroidManifest.xml | 12 +-
.../res/debug/layout/fragment_item_grid.xml | 7 +-
.../res/debug/layout/fragment_item_list.xml | 8 +-
.../res/debug/layout/fragment_login.xml | 6 +
.../debug/layout/fragment_workflow_detail.xml | 3 +-
.../res/debug/layout/workflow_item_layout.xml | 5 +-
.../res/debug/layout/workflow_layout.xml | 5 +-
.../debug/mipmap-hdpi-v4/ic_dashboard_home.png | Bin 0 -> 226 bytes
.../debug/mipmap-mdpi-v4/ic_dashboard_home.png | Bin 0 -> 319 bytes
.../debug/mipmap-xhdpi-v4/ic_dashboard_home.png | Bin 0 -> 344 bytes
.../mipmap-xxhdpi-v4/ic_dashboard_home.png | Bin 0 -> 454 bytes
.../mipmap-xxxhdpi-v4/ic_dashboard_home.png | Bin 0 -> 436 bytes
.../intermediates/res/debug/values/values.xml | 25 ++-
.../res/debug/xml/pref_general.xml | 34 +++
.../res/debug/xml/pref_headers.xml | 10 +
.../intermediates/resources/resources-debug.ap_ | Bin 719065 -> 729303 bytes
app/build/intermediates/symbols/debug/R.txt | 210 ++++++++++---------
app/build/outputs/apk/app-debug-unaligned.apk | Bin 1446840 -> 1462942 bytes
app/build/outputs/apk/app-debug.apk | Bin 1447238 -> 1463342 bytes
.../logs/manifest-merger-debug-report.txt | 16 +-
.../activities/DashboardMainActivity.java | 12 +-
.../mobile/activities/FlashScreenActivity.java | 19 +-
.../mobile/activities/LoginActivity.java | 122 ++++++++++-
.../mobile/adapters/WorkflowAdapter.java | 10 +
.../mobile/fragments/WorkflowItemFragment.java | 40 +++-
.../mobile/tavernamobile/TavernaPlayerAPI.java | 15 +-
app/src/main/res/layout/fragment_login.xml | 6 +
app/src/main/res/values/strings.xml | 4 +
80 files changed, 554 insertions(+), 234 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/05a2c718/app/build.gradle
----------------------------------------------------------------------
diff --git a/app/build.gradle b/app/build.gradle
index 4f29372..60d4b2d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -3,7 +3,7 @@ apply plugin: 'com.android.application'
android {
compileSdkVersion 21
buildToolsVersion "21.1.2"
- lintOptions{
+ lintOptions {
abortOnError false
}
@@ -27,4 +27,5 @@ dependencies {
compile 'com.android.support:appcompat-v7:22.0.0'
compile 'com.android.support:cardview-v7:22.0.0'
compile 'com.android.support:recyclerview-v7:22.0.0'
+ compile 'com.android.support:support-v4:22.0.0'
}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/05a2c718/app/build/generated/source/r/debug/org/apache/taverna/mobile/R.java
----------------------------------------------------------------------
diff --git a/app/build/generated/source/r/debug/org/apache/taverna/mobile/R.java b/app/build/generated/source/r/debug/org/apache/taverna/mobile/R.java
index db65fb2..998faa7 100644
--- a/app/build/generated/source/r/debug/org/apache/taverna/mobile/R.java
+++ b/app/build/generated/source/r/debug/org/apache/taverna/mobile/R.java
@@ -1442,8 +1442,8 @@ containing a value of this type.
public static final int tavernalogo=0x7f020043;
}
public static final class id {
- public static final int aboutworkflowTextView=0x7f0b0063;
- public static final int actionLayout=0x7f0b006b;
+ public static final int aboutworkflowTextView=0x7f0b0065;
+ public static final int actionLayout=0x7f0b006d;
public static final int action_bar=0x7f0b0031;
public static final int action_bar_activity_content=0x7f0b0000;
public static final int action_bar_container=0x7f0b0030;
@@ -1457,16 +1457,16 @@ containing a value of this type.
public static final int action_mode_bar=0x7f0b002e;
public static final int action_mode_bar_stub=0x7f0b002d;
public static final int action_mode_close_button=0x7f0b0020;
- public static final int action_search=0x7f0b0085;
- public static final int action_settings=0x7f0b0086;
+ public static final int action_search=0x7f0b0087;
+ public static final int action_settings=0x7f0b0088;
public static final int activity_chooser_view_content=0x7f0b0021;
public static final int always=0x7f0b0016;
public static final int author=0x7f0b0049;
public static final int author_profile_image=0x7f0b004b;
public static final int beginning=0x7f0b0013;
- public static final int button_download_workflow=0x7f0b007a;
- public static final int button_mark_workflow=0x7f0b007b;
- public static final int button_view_workflow=0x7f0b0079;
+ public static final int button_download_workflow=0x7f0b007c;
+ public static final int button_mark_workflow=0x7f0b007d;
+ public static final int button_view_workflow=0x7f0b007b;
public static final int checkbox=0x7f0b0029;
public static final int collapseActionView=0x7f0b0017;
public static final int container=0x7f0b0042;
@@ -1477,12 +1477,12 @@ containing a value of this type.
public static final int default_activity_button=0x7f0b0024;
public static final int dialog=0x7f0b001b;
public static final int disableHome=0x7f0b000c;
- public static final int download_wk=0x7f0b006d;
+ public static final int download_wk=0x7f0b006f;
public static final int drawer_layout=0x7f0b003f;
public static final int dropdown=0x7f0b001c;
- public static final int editTextUsername=0x7f0b005a;
+ public static final int editTextUsername=0x7f0b005b;
public static final int edit_query=0x7f0b0033;
- public static final int edittextPassword=0x7f0b005c;
+ public static final int edittextPassword=0x7f0b005d;
public static final int end=0x7f0b0014;
public static final int expand_activities_button=0x7f0b0022;
public static final int expanded_menu=0x7f0b0028;
@@ -1492,24 +1492,24 @@ containing a value of this type.
public static final int icon=0x7f0b0026;
public static final int ifRoom=0x7f0b0018;
public static final int image=0x7f0b0023;
- public static final int imageButtonState=0x7f0b0083;
+ public static final int imageButtonState=0x7f0b0085;
public static final int imageView=0x7f0b0044;
public static final int imageView2=0x7f0b0045;
- public static final int imageView3=0x7f0b005f;
- public static final int imageView4=0x7f0b0060;
- public static final int layoutinfo=0x7f0b0076;
+ public static final int imageView3=0x7f0b0061;
+ public static final int imageView4=0x7f0b0062;
+ public static final int layoutinfo=0x7f0b0078;
public static final int linearlayout_workflow_info=0x7f0b004a;
public static final int listMode=0x7f0b0009;
public static final int list_item=0x7f0b0025;
- public static final int loginbutton=0x7f0b005d;
- public static final int loginlayout=0x7f0b0057;
- public static final int logo=0x7f0b0055;
- public static final int mark_wk=0x7f0b006e;
- public static final int menuIcon=0x7f0b0070;
- public static final int menuItemText=0x7f0b0071;
+ public static final int loginbutton=0x7f0b005f;
+ public static final int loginlayout=0x7f0b0058;
+ public static final int logo=0x7f0b0056;
+ public static final int mark_wk=0x7f0b0070;
+ public static final int menuIcon=0x7f0b0072;
+ public static final int menuItemText=0x7f0b0073;
public static final int middle=0x7f0b0015;
public static final int navigation_drawer=0x7f0b0043;
- public static final int navigation_drawer_listview=0x7f0b0061;
+ public static final int navigation_drawer_listview=0x7f0b0063;
public static final int never=0x7f0b0019;
public static final int none=0x7f0b000e;
public static final int normal=0x7f0b000a;
@@ -1519,12 +1519,14 @@ containing a value of this type.
public static final int progress_circular=0x7f0b0005;
public static final int progress_horizontal=0x7f0b0006;
public static final int radio=0x7f0b002b;
- public static final int recycler_list=0x7f0b007c;
- public static final int run_wk=0x7f0b006c;
- public static final int runfinished=0x7f0b0082;
- public static final int runstarted=0x7f0b007f;
- public static final int runtitle=0x7f0b007d;
- public static final int scrollView=0x7f0b0065;
+ public static final int recycler_list=0x7f0b007e;
+ public static final int refresh=0x7f0b0054;
+ public static final int rememberCheckbox=0x7f0b005e;
+ public static final int run_wk=0x7f0b006e;
+ public static final int runfinished=0x7f0b0084;
+ public static final int runstarted=0x7f0b0081;
+ public static final int runtitle=0x7f0b007f;
+ public static final int scrollView=0x7f0b0067;
public static final int search_badge=0x7f0b0035;
public static final int search_bar=0x7f0b0034;
public static final int search_button=0x7f0b0036;
@@ -1539,44 +1541,44 @@ containing a value of this type.
public static final int showCustom=0x7f0b000f;
public static final int showHome=0x7f0b0010;
public static final int showTitle=0x7f0b0011;
- public static final int show_more=0x7f0b0075;
+ public static final int show_more=0x7f0b0077;
public static final int split_action_bar=0x7f0b0007;
public static final int submit_area=0x7f0b003c;
public static final int tabMode=0x7f0b000b;
- public static final int textState=0x7f0b0084;
+ public static final int textState=0x7f0b0086;
public static final int textView=0x7f0b0046;
public static final int textView10=0x7f0b004e;
public static final int textView11=0x7f0b0050;
public static final int textView12=0x7f0b0052;
- public static final int textView13=0x7f0b007e;
- public static final int textView14=0x7f0b0080;
- public static final int textView15=0x7f0b0081;
+ public static final int textView13=0x7f0b0080;
+ public static final int textView14=0x7f0b0082;
+ public static final int textView15=0x7f0b0083;
public static final int textView2=0x7f0b0047;
- public static final int textView3=0x7f0b0056;
- public static final int textView4=0x7f0b0058;
- public static final int textView5=0x7f0b0059;
- public static final int textView6=0x7f0b005b;
- public static final int textView7=0x7f0b005e;
- public static final int textView8=0x7f0b0062;
+ public static final int textView3=0x7f0b0057;
+ public static final int textView4=0x7f0b0059;
+ public static final int textView5=0x7f0b005a;
+ public static final int textView6=0x7f0b005c;
+ public static final int textView7=0x7f0b0060;
+ public static final int textView8=0x7f0b0064;
public static final int textView9=0x7f0b004c;
public static final int title=0x7f0b0027;
public static final int up=0x7f0b0008;
public static final int useLogo=0x7f0b0012;
- public static final int wcreatedat=0x7f0b0067;
- public static final int wdescription=0x7f0b0069;
+ public static final int wcreatedat=0x7f0b0069;
+ public static final int wdescription=0x7f0b006b;
public static final int withText=0x7f0b001a;
- public static final int wkf_author=0x7f0b0064;
- public static final int wkf_image=0x7f0b006a;
- public static final int wkll=0x7f0b0072;
- public static final int workflow_author=0x7f0b0073;
- public static final int workflow_brief_description=0x7f0b0077;
- public static final int workflow_image=0x7f0b0078;
- public static final int workflow_pb=0x7f0b0054;
- public static final int workflow_title=0x7f0b0074;
- public static final int workflowpolicyTextView=0x7f0b006f;
+ public static final int wkf_author=0x7f0b0066;
+ public static final int wkf_image=0x7f0b006c;
+ public static final int wkll=0x7f0b0074;
+ public static final int workflow_author=0x7f0b0075;
+ public static final int workflow_brief_description=0x7f0b0079;
+ public static final int workflow_image=0x7f0b007a;
+ public static final int workflow_pb=0x7f0b0055;
+ public static final int workflow_title=0x7f0b0076;
+ public static final int workflowpolicyTextView=0x7f0b0071;
public static final int wrap_content=0x7f0b001d;
- public static final int wtitle=0x7f0b0066;
- public static final int wupdatedat=0x7f0b0068;
+ public static final int wtitle=0x7f0b0068;
+ public static final int wupdatedat=0x7f0b006a;
}
public static final class integer {
public static final int abc_config_activityDefaultDur=0x7f0c0000;
@@ -1634,18 +1636,19 @@ containing a value of this type.
}
public static final class mipmap {
public static final int ic_about=0x7f030000;
- public static final int ic_launcher=0x7f030001;
- public static final int ic_logout=0x7f030002;
- public static final int ic_markworkflow_selected=0x7f030003;
- public static final int ic_markworkflow_unselected=0x7f030004;
- public static final int ic_openwk=0x7f030005;
- public static final int ic_poweredby=0x7f030006;
- public static final int ic_quit=0x7f030007;
- public static final int ic_usage=0x7f030008;
- public static final int ic_user=0x7f030009;
- public static final int ic_viewworkflow=0x7f03000a;
- public static final int ic_workflows=0x7f03000b;
- public static final int icuserprofiles=0x7f03000c;
+ public static final int ic_dashboard_home=0x7f030001;
+ public static final int ic_launcher=0x7f030002;
+ public static final int ic_logout=0x7f030003;
+ public static final int ic_markworkflow_selected=0x7f030004;
+ public static final int ic_markworkflow_unselected=0x7f030005;
+ public static final int ic_openwk=0x7f030006;
+ public static final int ic_poweredby=0x7f030007;
+ public static final int ic_quit=0x7f030008;
+ public static final int ic_usage=0x7f030009;
+ public static final int ic_user=0x7f03000a;
+ public static final int ic_viewworkflow=0x7f03000b;
+ public static final int ic_workflows=0x7f03000c;
+ public static final int icuserprofiles=0x7f03000d;
}
public static final class string {
public static final int Logininfo=0x7f0d0000;
@@ -1681,37 +1684,52 @@ containing a value of this type.
public static final int downloaderror=0x7f0d001e;
public static final int downloadfailed=0x7f0d001f;
public static final int downloadprogress=0x7f0d0020;
- public static final int favorite_empty=0x7f0d0021;
- public static final int hello_blank_fragment=0x7f0d0022;
- public static final int hello_world=0x7f0d0023;
- public static final int loading=0x7f0d0024;
- public static final int loginbutton=0x7f0d0025;
- public static final int loginpassword=0x7f0d0026;
- public static final int loginusername=0x7f0d0027;
- public static final int marked=0x7f0d0028;
- public static final int menu_search=0x7f0d0029;
- public static final int modified=0x7f0d002a;
- public static final int navigation_drawer_close=0x7f0d002b;
- public static final int navigation_drawer_open=0x7f0d002c;
- public static final int play_workflow=0x7f0d002d;
- public static final int search_hint=0x7f0d002e;
- public static final int seemore=0x7f0d002f;
- public static final int title_about=0x7f0d0030;
- public static final int title_activity_dashboard_main=0x7f0d0031;
- public static final int title_activity_flash_screen=0x7f0d0032;
- public static final int title_activity_workflow_detail=0x7f0d0033;
- public static final int title_exit=0x7f0d0034;
- public static final int title_explore=0x7f0d0035;
- public static final int title_favorite=0x7f0d0036;
- public static final int title_openworkflow=0x7f0d0037;
- public static final int title_usage=0x7f0d0038;
- public static final int wktitle=0x7f0d0039;
- public static final int workflow_authorhint=0x7f0d003a;
- public static final int workflow_component=0x7f0d003b;
- public static final int workflow_download=0x7f0d003c;
- public static final int workflow_empty=0x7f0d003d;
- public static final int workflow_mark=0x7f0d003e;
- public static final int workflow_read=0x7f0d003f;
+ public static final int emailerr=0x7f0d0021;
+ public static final int favorite_empty=0x7f0d0022;
+ public static final int fetchrun=0x7f0d0023;
+ public static final int hello_blank_fragment=0x7f0d0024;
+ public static final int hello_world=0x7f0d0025;
+ public static final int keeplogin=0x7f0d0026;
+ public static final int loading=0x7f0d0027;
+ public static final int loadworkflows=0x7f0d0028;
+ public static final int loginbutton=0x7f0d0029;
+ public static final int loginpassword=0x7f0d002a;
+ public static final int loginusername=0x7f0d002b;
+ public static final int marked=0x7f0d002c;
+ public static final int menu_search=0x7f0d002d;
+ public static final int modified=0x7f0d002e;
+ public static final int navigation_drawer_close=0x7f0d002f;
+ public static final int navigation_drawer_open=0x7f0d0030;
+ public static final int passworderr=0x7f0d0031;
+ public static final int play_workflow=0x7f0d0032;
+ public static final int pref_header_general=0x7f0d0033;
+ public static final int pref_login_description=0x7f0d0034;
+ public static final int pref_player_default=0x7f0d0035;
+ public static final int pref_player_des=0x7f0d0036;
+ public static final int pref_player_title=0x7f0d0037;
+ public static final int pref_remainLogged_in=0x7f0d0038;
+ public static final int pref_server_default=0x7f0d0039;
+ public static final int pref_server_des=0x7f0d003a;
+ public static final int pref_server_title=0x7f0d003b;
+ public static final int search_hint=0x7f0d003c;
+ public static final int seemore=0x7f0d003d;
+ public static final int title_about=0x7f0d003e;
+ public static final int title_activity_dashboard_main=0x7f0d003f;
+ public static final int title_activity_flash_screen=0x7f0d0040;
+ public static final int title_activity_settings=0x7f0d0041;
+ public static final int title_activity_workflow_detail=0x7f0d0042;
+ public static final int title_exit=0x7f0d0043;
+ public static final int title_explore=0x7f0d0044;
+ public static final int title_favorite=0x7f0d0045;
+ public static final int title_openworkflow=0x7f0d0046;
+ public static final int title_usage=0x7f0d0047;
+ public static final int wktitle=0x7f0d0048;
+ public static final int workflow_authorhint=0x7f0d0049;
+ public static final int workflow_component=0x7f0d004a;
+ public static final int workflow_download=0x7f0d004b;
+ public static final int workflow_empty=0x7f0d004c;
+ public static final int workflow_mark=0x7f0d004d;
+ public static final int workflow_read=0x7f0d004e;
}
public static final class style {
public static final int Animation_AppCompat_DropDownUp=0x7f0e0000;
@@ -1970,7 +1988,9 @@ containing a value of this type.
public static final int Widget_AppCompat_Toolbar_Button_Navigation=0x7f0e00ef;
}
public static final class xml {
- public static final int searchable=0x7f060000;
+ public static final int pref_general=0x7f060000;
+ public static final int pref_headers=0x7f060001;
+ public static final int searchable=0x7f060002;
}
public static final class styleable {
/** Attributes that can be used with a ActionBar.
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/05a2c718/app/build/intermediates/classes/debug/org/apache/taverna/mobile/R$id.class
----------------------------------------------------------------------
diff --git a/app/build/intermediates/classes/debug/org/apache/taverna/mobile/R$id.class b/app/build/intermediates/classes/debug/org/apache/taverna/mobile/R$id.class
index 698d884..8fc3192 100644
Binary files a/app/build/intermediates/classes/debug/org/apache/taverna/mobile/R$id.class and b/app/build/intermediates/classes/debug/org/apache/taverna/mobile/R$id.class differ
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/05a2c718/app/build/intermediates/classes/debug/org/apache/taverna/mobile/R$integer.class
----------------------------------------------------------------------
diff --git a/app/build/intermediates/classes/debug/org/apache/taverna/mobile/R$integer.class b/app/build/intermediates/classes/debug/org/apache/taverna/mobile/R$integer.class
index 1fd7af3..059ec90 100644
Binary files a/app/build/intermediates/classes/debug/org/apache/taverna/mobile/R$integer.class and b/app/build/intermediates/classes/debug/org/apache/taverna/mobile/R$integer.class differ
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/05a2c718/app/build/intermediates/classes/debug/org/apache/taverna/mobile/R$layout.class
----------------------------------------------------------------------
diff --git a/app/build/intermediates/classes/debug/org/apache/taverna/mobile/R$layout.class b/app/build/intermediates/classes/debug/org/apache/taverna/mobile/R$layout.class
index 2c1dd60..7831b7a 100644
Binary files a/app/build/intermediates/classes/debug/org/apache/taverna/mobile/R$layout.class and b/app/build/intermediates/classes/debug/org/apache/taverna/mobile/R$layout.class differ
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/05a2c718/app/build/intermediates/classes/debug/org/apache/taverna/mobile/R$menu.class
----------------------------------------------------------------------
diff --git a/app/build/intermediates/classes/debug/org/apache/taverna/mobile/R$menu.class b/app/build/intermediates/classes/debug/org/apache/taverna/mobile/R$menu.class
index 3ddc2f9..01bd97d 100644
Binary files a/app/build/intermediates/classes/debug/org/apache/taverna/mobile/R$menu.class and b/app/build/intermediates/classes/debug/org/apache/taverna/mobile/R$menu.class differ
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/05a2c718/app/build/intermediates/classes/debug/org/apache/taverna/mobile/R$mipmap.class
----------------------------------------------------------------------
diff --git a/app/build/intermediates/classes/debug/org/apache/taverna/mobile/R$mipmap.class b/app/build/intermediates/classes/debug/org/apache/taverna/mobile/R$mipmap.class
index 644aff0..fb932e5 100644
Binary files a/app/build/intermediates/classes/debug/org/apache/taverna/mobile/R$mipmap.class and b/app/build/intermediates/classes/debug/org/apache/taverna/mobile/R$mipmap.class differ
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/05a2c718/app/build/intermediates/classes/debug/org/apache/taverna/mobile/R$string.class
----------------------------------------------------------------------
diff --git a/app/build/intermediates/classes/debug/org/apache/taverna/mobile/R$string.class b/app/build/intermediates/classes/debug/org/apache/taverna/mobile/R$string.class
index db2812e..333ba1e 100644
Binary files a/app/build/intermediates/classes/debug/org/apache/taverna/mobile/R$string.class and b/app/build/intermediates/classes/debug/org/apache/taverna/mobile/R$string.class differ
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/05a2c718/app/build/intermediates/classes/debug/org/apache/taverna/mobile/R$style.class
----------------------------------------------------------------------
diff --git a/app/build/intermediates/classes/debug/org/apache/taverna/mobile/R$style.class b/app/build/intermediates/classes/debug/org/apache/taverna/mobile/R$style.class
index 5c718b9..f677c66 100644
Binary files a/app/build/intermediates/classes/debug/org/apache/taverna/mobile/R$style.class and b/app/build/intermediates/classes/debug/org/apache/taverna/mobile/R$style.class differ
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/05a2c718/app/build/intermediates/classes/debug/org/apache/taverna/mobile/R$styleable.class
----------------------------------------------------------------------
diff --git a/app/build/intermediates/classes/debug/org/apache/taverna/mobile/R$styleable.class b/app/build/intermediates/classes/debug/org/apache/taverna/mobile/R$styleable.class
index 9bf2408..b838172 100644
Binary files a/app/build/intermediates/classes/debug/org/apache/taverna/mobile/R$styleable.class and b/app/build/intermediates/classes/debug/org/apache/taverna/mobile/R$styleable.class differ
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/05a2c718/app/build/intermediates/classes/debug/org/apache/taverna/mobile/R$xml.class
----------------------------------------------------------------------
diff --git a/app/build/intermediates/classes/debug/org/apache/taverna/mobile/R$xml.class b/app/build/intermediates/classes/debug/org/apache/taverna/mobile/R$xml.class
index c8570da..722ad1b 100644
Binary files a/app/build/intermediates/classes/debug/org/apache/taverna/mobile/R$xml.class and b/app/build/intermediates/classes/debug/org/apache/taverna/mobile/R$xml.class differ
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/05a2c718/app/build/intermediates/classes/debug/org/apache/taverna/mobile/R.class
----------------------------------------------------------------------
diff --git a/app/build/intermediates/classes/debug/org/apache/taverna/mobile/R.class b/app/build/intermediates/classes/debug/org/apache/taverna/mobile/R.class
index 19930f4..0d2e8c6 100644
Binary files a/app/build/intermediates/classes/debug/org/apache/taverna/mobile/R.class and b/app/build/intermediates/classes/debug/org/apache/taverna/mobile/R.class differ
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/05a2c718/app/build/intermediates/classes/debug/org/apache/taverna/mobile/activities/DashboardMainActivity$MyAdapter.class
----------------------------------------------------------------------
diff --git a/app/build/intermediates/classes/debug/org/apache/taverna/mobile/activities/DashboardMainActivity$MyAdapter.class b/app/build/intermediates/classes/debug/org/apache/taverna/mobile/activities/DashboardMainActivity$MyAdapter.class
index d3bc4a4..5babf29 100644
Binary files a/app/build/intermediates/classes/debug/org/apache/taverna/mobile/activities/DashboardMainActivity$MyAdapter.class and b/app/build/intermediates/classes/debug/org/apache/taverna/mobile/activities/DashboardMainActivity$MyAdapter.class differ
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/05a2c718/app/build/intermediates/classes/debug/org/apache/taverna/mobile/activities/DashboardMainActivity.class
----------------------------------------------------------------------
diff --git a/app/build/intermediates/classes/debug/org/apache/taverna/mobile/activities/DashboardMainActivity.class b/app/build/intermediates/classes/debug/org/apache/taverna/mobile/activities/DashboardMainActivity.class
index b773a74..b7b268c 100644
Binary files a/app/build/intermediates/classes/debug/org/apache/taverna/mobile/activities/DashboardMainActivity.class and b/app/build/intermediates/classes/debug/org/apache/taverna/mobile/activities/DashboardMainActivity.class differ
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/05a2c718/app/build/intermediates/classes/debug/org/apache/taverna/mobile/activities/FlashScreenActivity$1.class
----------------------------------------------------------------------
diff --git a/app/build/intermediates/classes/debug/org/apache/taverna/mobile/activities/FlashScreenActivity$1.class b/app/build/intermediates/classes/debug/org/apache/taverna/mobile/activities/FlashScreenActivity$1.class
index 289958f..75da1c4 100644
Binary files a/app/build/intermediates/classes/debug/org/apache/taverna/mobile/activities/FlashScreenActivity$1.class and b/app/build/intermediates/classes/debug/org/apache/taverna/mobile/activities/FlashScreenActivity$1.class differ
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/05a2c718/app/build/intermediates/classes/debug/org/apache/taverna/mobile/activities/FlashScreenActivity.class
----------------------------------------------------------------------
diff --git a/app/build/intermediates/classes/debug/org/apache/taverna/mobile/activities/FlashScreenActivity.class b/app/build/intermediates/classes/debug/org/apache/taverna/mobile/activities/FlashScreenActivity.class
index 168c623..cf65376 100644
Binary files a/app/build/intermediates/classes/debug/org/apache/taverna/mobile/activities/FlashScreenActivity.class and b/app/build/intermediates/classes/debug/org/apache/taverna/mobile/activities/FlashScreenActivity.class differ
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/05a2c718/app/build/intermediates/classes/debug/org/apache/taverna/mobile/activities/LoginActivity$1.class
----------------------------------------------------------------------
diff --git a/app/build/intermediates/classes/debug/org/apache/taverna/mobile/activities/LoginActivity$1.class b/app/build/intermediates/classes/debug/org/apache/taverna/mobile/activities/LoginActivity$1.class
new file mode 100644
index 0000000..5afb969
Binary files /dev/null and b/app/build/intermediates/classes/debug/org/apache/taverna/mobile/activities/LoginActivity$1.class differ
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/05a2c718/app/build/intermediates/classes/debug/org/apache/taverna/mobile/activities/LoginActivity$LoginFragment$LoginTask.class
----------------------------------------------------------------------
diff --git a/app/build/intermediates/classes/debug/org/apache/taverna/mobile/activities/LoginActivity$LoginFragment$LoginTask.class b/app/build/intermediates/classes/debug/org/apache/taverna/mobile/activities/LoginActivity$LoginFragment$LoginTask.class
new file mode 100644
index 0000000..cbb8586
Binary files /dev/null and b/app/build/intermediates/classes/debug/org/apache/taverna/mobile/activities/LoginActivity$LoginFragment$LoginTask.class differ
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/05a2c718/app/build/intermediates/classes/debug/org/apache/taverna/mobile/activities/LoginActivity$LoginFragment.class
----------------------------------------------------------------------
diff --git a/app/build/intermediates/classes/debug/org/apache/taverna/mobile/activities/LoginActivity$LoginFragment.class b/app/build/intermediates/classes/debug/org/apache/taverna/mobile/activities/LoginActivity$LoginFragment.class
index 4df4866..8d7b8f0 100644
Binary files a/app/build/intermediates/classes/debug/org/apache/taverna/mobile/activities/LoginActivity$LoginFragment.class and b/app/build/intermediates/classes/debug/org/apache/taverna/mobile/activities/LoginActivity$LoginFragment.class differ
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/05a2c718/app/build/intermediates/classes/debug/org/apache/taverna/mobile/activities/LoginActivity.class
----------------------------------------------------------------------
diff --git a/app/build/intermediates/classes/debug/org/apache/taverna/mobile/activities/LoginActivity.class b/app/build/intermediates/classes/debug/org/apache/taverna/mobile/activities/LoginActivity.class
index a93cdc6..857b359 100644
Binary files a/app/build/intermediates/classes/debug/org/apache/taverna/mobile/activities/LoginActivity.class and b/app/build/intermediates/classes/debug/org/apache/taverna/mobile/activities/LoginActivity.class differ
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/05a2c718/app/build/intermediates/classes/debug/org/apache/taverna/mobile/activities/SettingsActivity$1.class
----------------------------------------------------------------------
diff --git a/app/build/intermediates/classes/debug/org/apache/taverna/mobile/activities/SettingsActivity$1.class b/app/build/intermediates/classes/debug/org/apache/taverna/mobile/activities/SettingsActivity$1.class
new file mode 100644
index 0000000..d167698
Binary files /dev/null and b/app/build/intermediates/classes/debug/org/apache/taverna/mobile/activities/SettingsActivity$1.class differ
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/05a2c718/app/build/intermediates/classes/debug/org/apache/taverna/mobile/activities/SettingsActivity$GeneralPreferenceFragment.class
----------------------------------------------------------------------
diff --git a/app/build/intermediates/classes/debug/org/apache/taverna/mobile/activities/SettingsActivity$GeneralPreferenceFragment.class b/app/build/intermediates/classes/debug/org/apache/taverna/mobile/activities/SettingsActivity$GeneralPreferenceFragment.class
new file mode 100644
index 0000000..65fb62d
Binary files /dev/null and b/app/build/intermediates/classes/debug/org/apache/taverna/mobile/activities/SettingsActivity$GeneralPreferenceFragment.class differ
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/05a2c718/app/build/intermediates/classes/debug/org/apache/taverna/mobile/activities/SettingsActivity.class
----------------------------------------------------------------------
diff --git a/app/build/intermediates/classes/debug/org/apache/taverna/mobile/activities/SettingsActivity.class b/app/build/intermediates/classes/debug/org/apache/taverna/mobile/activities/SettingsActivity.class
new file mode 100644
index 0000000..5a36994
Binary files /dev/null and b/app/build/intermediates/classes/debug/org/apache/taverna/mobile/activities/SettingsActivity.class differ
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/05a2c718/app/build/intermediates/classes/debug/org/apache/taverna/mobile/activities/WorkflowDetailActivity$SectionsPagerAdapter.class
----------------------------------------------------------------------
diff --git a/app/build/intermediates/classes/debug/org/apache/taverna/mobile/activities/WorkflowDetailActivity$SectionsPagerAdapter.class b/app/build/intermediates/classes/debug/org/apache/taverna/mobile/activities/WorkflowDetailActivity$SectionsPagerAdapter.class
index a2f0e71..495626e 100644
Binary files a/app/build/intermediates/classes/debug/org/apache/taverna/mobile/activities/WorkflowDetailActivity$SectionsPagerAdapter.class and b/app/build/intermediates/classes/debug/org/apache/taverna/mobile/activities/WorkflowDetailActivity$SectionsPagerAdapter.class differ
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/05a2c718/app/build/intermediates/classes/debug/org/apache/taverna/mobile/activities/WorkflowDetailActivity.class
----------------------------------------------------------------------
diff --git a/app/build/intermediates/classes/debug/org/apache/taverna/mobile/activities/WorkflowDetailActivity.class b/app/build/intermediates/classes/debug/org/apache/taverna/mobile/activities/WorkflowDetailActivity.class
index ed7c9af..2ed71b5 100644
Binary files a/app/build/intermediates/classes/debug/org/apache/taverna/mobile/activities/WorkflowDetailActivity.class and b/app/build/intermediates/classes/debug/org/apache/taverna/mobile/activities/WorkflowDetailActivity.class differ
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/05a2c718/app/build/intermediates/classes/debug/org/apache/taverna/mobile/adapters/RunAdapter$RunHolder.class
----------------------------------------------------------------------
diff --git a/app/build/intermediates/classes/debug/org/apache/taverna/mobile/adapters/RunAdapter$RunHolder.class b/app/build/intermediates/classes/debug/org/apache/taverna/mobile/adapters/RunAdapter$RunHolder.class
index 8f71ac5..5895cb9 100644
Binary files a/app/build/intermediates/classes/debug/org/apache/taverna/mobile/adapters/RunAdapter$RunHolder.class and b/app/build/intermediates/classes/debug/org/apache/taverna/mobile/adapters/RunAdapter$RunHolder.class differ
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/05a2c718/app/build/intermediates/classes/debug/org/apache/taverna/mobile/adapters/SliderMenuAdapter$ViewHolder.class
----------------------------------------------------------------------
diff --git a/app/build/intermediates/classes/debug/org/apache/taverna/mobile/adapters/SliderMenuAdapter$ViewHolder.class b/app/build/intermediates/classes/debug/org/apache/taverna/mobile/adapters/SliderMenuAdapter$ViewHolder.class
index 8dfd551..7cacace 100644
Binary files a/app/build/intermediates/classes/debug/org/apache/taverna/mobile/adapters/SliderMenuAdapter$ViewHolder.class and b/app/build/intermediates/classes/debug/org/apache/taverna/mobile/adapters/SliderMenuAdapter$ViewHolder.class differ
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/05a2c718/app/build/intermediates/classes/debug/org/apache/taverna/mobile/adapters/SliderMenuAdapter.class
----------------------------------------------------------------------
diff --git a/app/build/intermediates/classes/debug/org/apache/taverna/mobile/adapters/SliderMenuAdapter.class b/app/build/intermediates/classes/debug/org/apache/taverna/mobile/adapters/SliderMenuAdapter.class
index dfa22d6..e2a311e 100644
Binary files a/app/build/intermediates/classes/debug/org/apache/taverna/mobile/adapters/SliderMenuAdapter.class and b/app/build/intermediates/classes/debug/org/apache/taverna/mobile/adapters/SliderMenuAdapter.class differ
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/05a2c718/app/build/intermediates/classes/debug/org/apache/taverna/mobile/adapters/WorkflowAdapter$1.class
----------------------------------------------------------------------
diff --git a/app/build/intermediates/classes/debug/org/apache/taverna/mobile/adapters/WorkflowAdapter$1.class b/app/build/intermediates/classes/debug/org/apache/taverna/mobile/adapters/WorkflowAdapter$1.class
index cb427e9..a3d8c66 100644
Binary files a/app/build/intermediates/classes/debug/org/apache/taverna/mobile/adapters/WorkflowAdapter$1.class and b/app/build/intermediates/classes/debug/org/apache/taverna/mobile/adapters/WorkflowAdapter$1.class differ
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/05a2c718/app/build/intermediates/classes/debug/org/apache/taverna/mobile/adapters/WorkflowAdapter$2.class
----------------------------------------------------------------------
diff --git a/app/build/intermediates/classes/debug/org/apache/taverna/mobile/adapters/WorkflowAdapter$2.class b/app/build/intermediates/classes/debug/org/apache/taverna/mobile/adapters/WorkflowAdapter$2.class
index 5b4005c..c1999aa 100644
Binary files a/app/build/intermediates/classes/debug/org/apache/taverna/mobile/adapters/WorkflowAdapter$2.class and b/app/build/intermediates/classes/debug/org/apache/taverna/mobile/adapters/WorkflowAdapter$2.class differ
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/05a2c718/app/build/intermediates/classes/debug/org/apache/taverna/mobile/adapters/WorkflowAdapter$3.class
----------------------------------------------------------------------
diff --git a/app/build/intermediates/classes/debug/org/apache/taverna/mobile/adapters/WorkflowAdapter$3.class b/app/build/intermediates/classes/debug/org/apache/taverna/mobile/adapters/WorkflowAdapter$3.class
index 58887d5..9e52c3c 100644
Binary files a/app/build/intermediates/classes/debug/org/apache/taverna/mobile/adapters/WorkflowAdapter$3.class and b/app/build/intermediates/classes/debug/org/apache/taverna/mobile/adapters/WorkflowAdapter$3.class differ
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/05a2c718/app/build/intermediates/classes/debug/org/apache/taverna/mobile/adapters/WorkflowAdapter$ViewHolder.class
----------------------------------------------------------------------
diff --git a/app/build/intermediates/classes/debug/org/apache/taverna/mobile/adapters/WorkflowAdapter$ViewHolder.class b/app/build/intermediates/classes/debug/org/apache/taverna/mobile/adapters/WorkflowAdapter$ViewHolder.class
index 83580f1..6a44441 100644
Binary files a/app/build/intermediates/classes/debug/org/apache/taverna/mobile/adapters/WorkflowAdapter$ViewHolder.class and b/app/build/intermediates/classes/debug/org/apache/taverna/mobile/adapters/WorkflowAdapter$ViewHolder.class differ
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/05a2c718/app/build/intermediates/classes/debug/org/apache/taverna/mobile/adapters/WorkflowAdapter.class
----------------------------------------------------------------------
diff --git a/app/build/intermediates/classes/debug/org/apache/taverna/mobile/adapters/WorkflowAdapter.class b/app/build/intermediates/classes/debug/org/apache/taverna/mobile/adapters/WorkflowAdapter.class
index 07ce368..eee226f 100644
Binary files a/app/build/intermediates/classes/debug/org/apache/taverna/mobile/adapters/WorkflowAdapter.class and b/app/build/intermediates/classes/debug/org/apache/taverna/mobile/adapters/WorkflowAdapter.class differ
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/05a2c718/app/build/intermediates/classes/debug/org/apache/taverna/mobile/broadcastreceivers/WorkflowDownloadReceiver.class
----------------------------------------------------------------------
diff --git a/app/build/intermediates/classes/debug/org/apache/taverna/mobile/broadcastreceivers/WorkflowDownloadReceiver.class b/app/build/intermediates/classes/debug/org/apache/taverna/mobile/broadcastreceivers/WorkflowDownloadReceiver.class
index e427d60..ad11a69 100644
Binary files a/app/build/intermediates/classes/debug/org/apache/taverna/mobile/broadcastreceivers/WorkflowDownloadReceiver.class and b/app/build/intermediates/classes/debug/org/apache/taverna/mobile/broadcastreceivers/WorkflowDownloadReceiver.class differ
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/05a2c718/app/build/intermediates/classes/debug/org/apache/taverna/mobile/fragments/NavigationDrawerFragment$2.class
----------------------------------------------------------------------
diff --git a/app/build/intermediates/classes/debug/org/apache/taverna/mobile/fragments/NavigationDrawerFragment$2.class b/app/build/intermediates/classes/debug/org/apache/taverna/mobile/fragments/NavigationDrawerFragment$2.class
index 34cb48a..c52cd6a 100644
Binary files a/app/build/intermediates/classes/debug/org/apache/taverna/mobile/fragments/NavigationDrawerFragment$2.class and b/app/build/intermediates/classes/debug/org/apache/taverna/mobile/fragments/NavigationDrawerFragment$2.class differ
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/05a2c718/app/build/intermediates/classes/debug/org/apache/taverna/mobile/fragments/NavigationDrawerFragment$3.class
----------------------------------------------------------------------
diff --git a/app/build/intermediates/classes/debug/org/apache/taverna/mobile/fragments/NavigationDrawerFragment$3.class b/app/build/intermediates/classes/debug/org/apache/taverna/mobile/fragments/NavigationDrawerFragment$3.class
index 3c4dce2..4149142 100644
Binary files a/app/build/intermediates/classes/debug/org/apache/taverna/mobile/fragments/NavigationDrawerFragment$3.class and b/app/build/intermediates/classes/debug/org/apache/taverna/mobile/fragments/NavigationDrawerFragment$3.class differ
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/05a2c718/app/build/intermediates/classes/debug/org/apache/taverna/mobile/fragments/NavigationDrawerFragment.class
----------------------------------------------------------------------
diff --git a/app/build/intermediates/classes/debug/org/apache/taverna/mobile/fragments/NavigationDrawerFragment.class b/app/build/intermediates/classes/debug/org/apache/taverna/mobile/fragments/NavigationDrawerFragment.class
index 6546907..81e3f30 100644
Binary files a/app/build/intermediates/classes/debug/org/apache/taverna/mobile/fragments/NavigationDrawerFragment.class and b/app/build/intermediates/classes/debug/org/apache/taverna/mobile/fragments/NavigationDrawerFragment.class differ
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/05a2c718/app/build/intermediates/classes/debug/org/apache/taverna/mobile/fragments/WorkflowItemFragment.class
----------------------------------------------------------------------
diff --git a/app/build/intermediates/classes/debug/org/apache/taverna/mobile/fragments/WorkflowItemFragment.class b/app/build/intermediates/classes/debug/org/apache/taverna/mobile/fragments/WorkflowItemFragment.class
index d895f3b..9a764bc 100644
Binary files a/app/build/intermediates/classes/debug/org/apache/taverna/mobile/fragments/WorkflowItemFragment.class and b/app/build/intermediates/classes/debug/org/apache/taverna/mobile/fragments/WorkflowItemFragment.class differ
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/05a2c718/app/build/intermediates/classes/debug/org/apache/taverna/mobile/fragments/workflowdetails/WorkflowRunHistoryFragment.class
----------------------------------------------------------------------
diff --git a/app/build/intermediates/classes/debug/org/apache/taverna/mobile/fragments/workflowdetails/WorkflowRunHistoryFragment.class b/app/build/intermediates/classes/debug/org/apache/taverna/mobile/fragments/workflowdetails/WorkflowRunHistoryFragment.class
index 28791d9..b146a10 100644
Binary files a/app/build/intermediates/classes/debug/org/apache/taverna/mobile/fragments/workflowdetails/WorkflowRunHistoryFragment.class and b/app/build/intermediates/classes/debug/org/apache/taverna/mobile/fragments/workflowdetails/WorkflowRunHistoryFragment.class differ
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/05a2c718/app/build/intermediates/classes/debug/org/apache/taverna/mobile/fragments/workflowdetails/WorkflowdetailFragment$1.class
----------------------------------------------------------------------
diff --git a/app/build/intermediates/classes/debug/org/apache/taverna/mobile/fragments/workflowdetails/WorkflowdetailFragment$1.class b/app/build/intermediates/classes/debug/org/apache/taverna/mobile/fragments/workflowdetails/WorkflowdetailFragment$1.class
new file mode 100644
index 0000000..8792f80
Binary files /dev/null and b/app/build/intermediates/classes/debug/org/apache/taverna/mobile/fragments/workflowdetails/WorkflowdetailFragment$1.class differ
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/05a2c718/app/build/intermediates/classes/debug/org/apache/taverna/mobile/fragments/workflowdetails/WorkflowdetailFragment$RunTask.class
----------------------------------------------------------------------
diff --git a/app/build/intermediates/classes/debug/org/apache/taverna/mobile/fragments/workflowdetails/WorkflowdetailFragment$RunTask.class b/app/build/intermediates/classes/debug/org/apache/taverna/mobile/fragments/workflowdetails/WorkflowdetailFragment$RunTask.class
new file mode 100644
index 0000000..d59bc27
Binary files /dev/null and b/app/build/intermediates/classes/debug/org/apache/taverna/mobile/fragments/workflowdetails/WorkflowdetailFragment$RunTask.class differ
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/05a2c718/app/build/intermediates/classes/debug/org/apache/taverna/mobile/fragments/workflowdetails/WorkflowdetailFragment$WorkflowRunTask$1.class
----------------------------------------------------------------------
diff --git a/app/build/intermediates/classes/debug/org/apache/taverna/mobile/fragments/workflowdetails/WorkflowdetailFragment$WorkflowRunTask$1.class b/app/build/intermediates/classes/debug/org/apache/taverna/mobile/fragments/workflowdetails/WorkflowdetailFragment$WorkflowRunTask$1.class
new file mode 100644
index 0000000..c94560b
Binary files /dev/null and b/app/build/intermediates/classes/debug/org/apache/taverna/mobile/fragments/workflowdetails/WorkflowdetailFragment$WorkflowRunTask$1.class differ
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/05a2c718/app/build/intermediates/classes/debug/org/apache/taverna/mobile/fragments/workflowdetails/WorkflowdetailFragment$WorkflowRunTask$2.class
----------------------------------------------------------------------
diff --git a/app/build/intermediates/classes/debug/org/apache/taverna/mobile/fragments/workflowdetails/WorkflowdetailFragment$WorkflowRunTask$2.class b/app/build/intermediates/classes/debug/org/apache/taverna/mobile/fragments/workflowdetails/WorkflowdetailFragment$WorkflowRunTask$2.class
new file mode 100644
index 0000000..b023ec0
Binary files /dev/null and b/app/build/intermediates/classes/debug/org/apache/taverna/mobile/fragments/workflowdetails/WorkflowdetailFragment$WorkflowRunTask$2.class differ
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/05a2c718/app/build/intermediates/classes/debug/org/apache/taverna/mobile/fragments/workflowdetails/WorkflowdetailFragment$WorkflowRunTask.class
----------------------------------------------------------------------
diff --git a/app/build/intermediates/classes/debug/org/apache/taverna/mobile/fragments/workflowdetails/WorkflowdetailFragment$WorkflowRunTask.class b/app/build/intermediates/classes/debug/org/apache/taverna/mobile/fragments/workflowdetails/WorkflowdetailFragment$WorkflowRunTask.class
new file mode 100644
index 0000000..bb586b9
Binary files /dev/null and b/app/build/intermediates/classes/debug/org/apache/taverna/mobile/fragments/workflowdetails/WorkflowdetailFragment$WorkflowRunTask.class differ
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/05a2c718/app/build/intermediates/classes/debug/org/apache/taverna/mobile/fragments/workflowdetails/WorkflowdetailFragment.class
----------------------------------------------------------------------
diff --git a/app/build/intermediates/classes/debug/org/apache/taverna/mobile/fragments/workflowdetails/WorkflowdetailFragment.class b/app/build/intermediates/classes/debug/org/apache/taverna/mobile/fragments/workflowdetails/WorkflowdetailFragment.class
index e992772..1395f30 100644
Binary files a/app/build/intermediates/classes/debug/org/apache/taverna/mobile/fragments/workflowdetails/WorkflowdetailFragment.class and b/app/build/intermediates/classes/debug/org/apache/taverna/mobile/fragments/workflowdetails/WorkflowdetailFragment.class differ
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/05a2c718/app/build/intermediates/classes/debug/org/apache/taverna/mobile/tavernamobile/TavernaPlayerAPI$Authenticator.class
----------------------------------------------------------------------
diff --git a/app/build/intermediates/classes/debug/org/apache/taverna/mobile/tavernamobile/TavernaPlayerAPI$Authenticator.class b/app/build/intermediates/classes/debug/org/apache/taverna/mobile/tavernamobile/TavernaPlayerAPI$Authenticator.class
index cb17727..b18aecc 100644
Binary files a/app/build/intermediates/classes/debug/org/apache/taverna/mobile/tavernamobile/TavernaPlayerAPI$Authenticator.class and b/app/build/intermediates/classes/debug/org/apache/taverna/mobile/tavernamobile/TavernaPlayerAPI$Authenticator.class differ
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/05a2c718/app/build/intermediates/classes/debug/org/apache/taverna/mobile/tavernamobile/TavernaPlayerAPI.class
----------------------------------------------------------------------
diff --git a/app/build/intermediates/classes/debug/org/apache/taverna/mobile/tavernamobile/TavernaPlayerAPI.class b/app/build/intermediates/classes/debug/org/apache/taverna/mobile/tavernamobile/TavernaPlayerAPI.class
index 0b07a0f..8daef05 100644
Binary files a/app/build/intermediates/classes/debug/org/apache/taverna/mobile/tavernamobile/TavernaPlayerAPI.class and b/app/build/intermediates/classes/debug/org/apache/taverna/mobile/tavernamobile/TavernaPlayerAPI.class differ
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/05a2c718/app/build/intermediates/classes/debug/org/apache/taverna/mobile/utils/DetailsLoader.class
----------------------------------------------------------------------
diff --git a/app/build/intermediates/classes/debug/org/apache/taverna/mobile/utils/DetailsLoader.class b/app/build/intermediates/classes/debug/org/apache/taverna/mobile/utils/DetailsLoader.class
index ee62f8b..77cc439 100644
Binary files a/app/build/intermediates/classes/debug/org/apache/taverna/mobile/utils/DetailsLoader.class and b/app/build/intermediates/classes/debug/org/apache/taverna/mobile/utils/DetailsLoader.class differ
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/05a2c718/app/build/intermediates/classes/debug/org/apache/taverna/mobile/utils/WorkflowDownloadManager.class
----------------------------------------------------------------------
diff --git a/app/build/intermediates/classes/debug/org/apache/taverna/mobile/utils/WorkflowDownloadManager.class b/app/build/intermediates/classes/debug/org/apache/taverna/mobile/utils/WorkflowDownloadManager.class
index 8c0e089..ae1d128 100644
Binary files a/app/build/intermediates/classes/debug/org/apache/taverna/mobile/utils/WorkflowDownloadManager.class and b/app/build/intermediates/classes/debug/org/apache/taverna/mobile/utils/WorkflowDownloadManager.class differ
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/05a2c718/app/build/intermediates/classes/debug/org/apache/taverna/mobile/utils/WorkflowLoader.class
----------------------------------------------------------------------
diff --git a/app/build/intermediates/classes/debug/org/apache/taverna/mobile/utils/WorkflowLoader.class b/app/build/intermediates/classes/debug/org/apache/taverna/mobile/utils/WorkflowLoader.class
index a5273b5..456d03a 100644
Binary files a/app/build/intermediates/classes/debug/org/apache/taverna/mobile/utils/WorkflowLoader.class and b/app/build/intermediates/classes/debug/org/apache/taverna/mobile/utils/WorkflowLoader.class differ
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/05a2c718/app/build/intermediates/dex/debug/classes.dex
----------------------------------------------------------------------
diff --git a/app/build/intermediates/dex/debug/classes.dex b/app/build/intermediates/dex/debug/classes.dex
index 6647be5..22c92d1 100644
Binary files a/app/build/intermediates/dex/debug/classes.dex and b/app/build/intermediates/dex/debug/classes.dex differ
[07/12] incubator-taverna-mobile git commit: Updated code to take
note of changes in PLAYER API class
Posted by ia...@apache.org.
Updated code to take note of changes in PLAYER API 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/334e7ffa
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/334e7ffa
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/334e7ffa
Branch: refs/heads/master
Commit: 334e7ffafe3cad0b6f10b0619f008d864703c709
Parents: 1fcf1fe
Author: larrytech7 <la...@gmail.com>
Authored: Tue Jun 16 16:46:04 2015 +0100
Committer: larrytech7 <la...@gmail.com>
Committed: Tue Jun 16 16:46:04 2015 +0100
----------------------------------------------------------------------
.../main/java/org/apache/taverna/mobile/utils/WorkflowLoader.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/334e7ffa/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 8c64553..569ed29 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
@@ -68,7 +68,7 @@ public class WorkflowLoader extends AsyncTaskLoader<List<Workflow>> {
//for password protected urls use the user's credentials
Authenticator.setDefault(new TavernaPlayerAPI.Authenticator("taverna","taverna"));
- URL workflowurl = new URL(TavernaPlayerAPI.PLAYER_WORKFLOW_URL);
+ URL workflowurl = new URL(new TavernaPlayerAPI(ctx).PLAYER_WORKFLOW_URL);
HttpURLConnection connection = (HttpURLConnection) workflowurl.openConnection();
String userpass = "icep603@gmail.com" + ":" + "creationfox";
String basicAuth = "Basic " + Base64.encodeToString(userpass.getBytes(),Base64.DEFAULT);
[02/12] incubator-taverna-mobile git commit: fixed id required for
loader to load correct run history of a workflow
Posted by ia...@apache.org.
fixed id required for loader to load correct run history of a 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/8f0764a5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/8f0764a5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/8f0764a5
Branch: refs/heads/master
Commit: 8f0764a57400315dd992972997f9ca87dc002309
Parents: 132b1bd
Author: larrytech7 <la...@gmail.com>
Authored: Mon Jun 15 13:38:02 2015 +0100
Committer: larrytech7 <la...@gmail.com>
Committed: Mon Jun 15 13:38:02 2015 +0100
----------------------------------------------------------------------
.../java/org/apache/taverna/mobile/adapters/WorkflowAdapter.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/8f0764a5/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 0f983bf..f53683e 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
@@ -43,6 +43,7 @@ import android.widget.TextView;
import org.apache.taverna.mobile.R;
import org.apache.taverna.mobile.activities.DashboardMainActivity;
import org.apache.taverna.mobile.activities.WorkflowDetailActivity;
+import org.apache.taverna.mobile.fragments.workflowdetails.WorkflowdetailFragment;
import org.apache.taverna.mobile.tavernamobile.Workflow;
import org.apache.taverna.mobile.utils.WorkflowDownloadManager;
@@ -92,6 +93,7 @@ public class WorkflowAdapter extends RecyclerView.Adapter<WorkflowAdapter.ViewHo
it.putExtra("title",title);
it.putExtra("description",desc_full);
it.putExtra("url", wkflow_url);
+ WorkflowdetailFragment.WORKFLO_ID = workflow.get(i).getId();
viewHolder.btn_view_workflow.setOnClickListener(new View.OnClickListener() {
@Override
[12/12] incubator-taverna-mobile git commit: This closes #4
Posted by ia...@apache.org.
This closes #4
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/41986741
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/41986741
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/41986741
Branch: refs/heads/master
Commit: 419867410f3123b82f93e67c2c8b4e1d4a40ee7b
Parents: a4d52e7 a08bc1d
Author: Ian Dunlop <ia...@manchester.ac.uk>
Authored: Mon Jun 22 11:21:58 2015 +0100
Committer: Ian Dunlop <ia...@manchester.ac.uk>
Committed: Mon Jun 22 11:21:58 2015 +0100
----------------------------------------------------------------------
app/build.gradle | 3 +-
.../r/debug/org/apache/taverna/mobile/R.java | 210 ++++++++--------
.../debug/org/apache/taverna/mobile/R$id.class | Bin 5255 -> 5326 bytes
.../org/apache/taverna/mobile/R$integer.class | Bin 540 -> 540 bytes
.../org/apache/taverna/mobile/R$layout.class | Bin 2386 -> 2386 bytes
.../org/apache/taverna/mobile/R$menu.class | Bin 493 -> 493 bytes
.../org/apache/taverna/mobile/R$mipmap.class | Bin 861 -> 902 bytes
.../org/apache/taverna/mobile/R$string.class | Bin 3169 -> 3764 bytes
.../org/apache/taverna/mobile/R$style.class | Bin 15948 -> 15948 bytes
.../org/apache/taverna/mobile/R$styleable.class | Bin 16512 -> 16512 bytes
.../debug/org/apache/taverna/mobile/R$xml.class | Bin 412 -> 484 bytes
.../debug/org/apache/taverna/mobile/R.class | Bin 1193 -> 1193 bytes
.../DashboardMainActivity$MyAdapter.class | Bin 1983 -> 1983 bytes
.../activities/DashboardMainActivity.class | Bin 9936 -> 8789 bytes
.../activities/FlashScreenActivity$1.class | Bin 1005 -> 1499 bytes
.../mobile/activities/FlashScreenActivity.class | Bin 1553 -> 2524 bytes
.../mobile/activities/LoginActivity$1.class | Bin 0 -> 261 bytes
.../LoginActivity$LoginFragment$LoginTask.class | Bin 0 -> 5533 bytes
.../LoginActivity$LoginFragment.class | Bin 1935 -> 3446 bytes
.../mobile/activities/LoginActivity.class | Bin 1740 -> 1806 bytes
.../mobile/activities/SettingsActivity$1.class | Bin 0 -> 1445 bytes
...ingsActivity$GeneralPreferenceFragment.class | Bin 0 -> 1156 bytes
.../mobile/activities/SettingsActivity.class | Bin 0 -> 4407 bytes
...lowDetailActivity$SectionsPagerAdapter.class | Bin 2615 -> 2640 bytes
.../activities/WorkflowDetailActivity.class | Bin 2253 -> 2171 bytes
.../mobile/adapters/RunAdapter$RunHolder.class | Bin 1141 -> 1141 bytes
.../adapters/SliderMenuAdapter$ViewHolder.class | Bin 911 -> 911 bytes
.../mobile/adapters/SliderMenuAdapter.class | Bin 2670 -> 2720 bytes
.../mobile/adapters/WorkflowAdapter$1.class | Bin 1461 -> 1461 bytes
.../mobile/adapters/WorkflowAdapter$2.class | Bin 2670 -> 2670 bytes
.../mobile/adapters/WorkflowAdapter$3.class | Bin 1418 -> 1418 bytes
.../adapters/WorkflowAdapter$ViewHolder.class | Bin 1506 -> 1506 bytes
.../mobile/adapters/WorkflowAdapter.class | Bin 5998 -> 6594 bytes
.../WorkflowDownloadReceiver.class | Bin 2533 -> 2256 bytes
.../fragments/NavigationDrawerFragment$2.class | Bin 1600 -> 1600 bytes
.../fragments/NavigationDrawerFragment$3.class | Bin 1044 -> 1044 bytes
.../fragments/NavigationDrawerFragment.class | Bin 7886 -> 7909 bytes
.../mobile/fragments/WorkflowItemFragment.class | Bin 8056 -> 9930 bytes
.../WorkflowRunHistoryFragment.class | Bin 6168 -> 6252 bytes
.../WorkflowdetailFragment$1.class | Bin 0 -> 318 bytes
.../WorkflowdetailFragment$RunTask.class | Bin 0 -> 4935 bytes
...rkflowdetailFragment$WorkflowRunTask$1.class | Bin 0 -> 3359 bytes
...rkflowdetailFragment$WorkflowRunTask$2.class | Bin 0 -> 1309 bytes
...WorkflowdetailFragment$WorkflowRunTask.class | Bin 0 -> 7730 bytes
.../WorkflowdetailFragment.class | Bin 6905 -> 8969 bytes
.../TavernaPlayerAPI$Authenticator.class | Bin 926 -> 926 bytes
.../mobile/tavernamobile/TavernaPlayerAPI.class | Bin 935 -> 2240 bytes
.../taverna/mobile/utils/DetailsLoader.class | Bin 6725 -> 6834 bytes
.../mobile/utils/WorkflowDownloadManager.class | Bin 5031 -> 4772 bytes
.../taverna/mobile/utils/WorkflowLoader.class | Bin 5613 -> 5583 bytes
app/build/intermediates/dex/debug/classes.dex | Bin 2147300 -> 2162936 bytes
.../incremental/mergeResources/debug/merger.xml | 6 +-
.../manifests/full/debug/AndroidManifest.xml | 12 +-
.../res/debug/layout/fragment_item_grid.xml | 7 +-
.../res/debug/layout/fragment_item_list.xml | 8 +-
.../res/debug/layout/fragment_login.xml | 6 +
.../debug/layout/fragment_workflow_detail.xml | 3 +-
.../res/debug/layout/workflow_item_layout.xml | 5 +-
.../res/debug/layout/workflow_layout.xml | 5 +-
.../debug/mipmap-hdpi-v4/ic_dashboard_home.png | Bin 0 -> 226 bytes
.../debug/mipmap-mdpi-v4/ic_dashboard_home.png | Bin 0 -> 319 bytes
.../debug/mipmap-xhdpi-v4/ic_dashboard_home.png | Bin 0 -> 344 bytes
.../mipmap-xxhdpi-v4/ic_dashboard_home.png | Bin 0 -> 454 bytes
.../mipmap-xxxhdpi-v4/ic_dashboard_home.png | Bin 0 -> 436 bytes
.../intermediates/res/debug/values/values.xml | 25 +-
.../res/debug/xml/pref_general.xml | 34 +++
.../res/debug/xml/pref_headers.xml | 10 +
.../intermediates/resources/resources-debug.ap_ | Bin 719065 -> 729303 bytes
app/build/intermediates/symbols/debug/R.txt | 210 ++++++++--------
app/build/outputs/apk/app-debug-unaligned.apk | Bin 1446840 -> 1462942 bytes
app/build/outputs/apk/app-debug.apk | Bin 1447238 -> 1463342 bytes
.../logs/manifest-merger-debug-report.txt | 16 +-
app/src/main/AndroidManifest.xml | 16 +-
app/src/main/ic_dashboard_home-web.png | Bin 0 -> 2121 bytes
.../activities/DashboardMainActivity.java | 38 ++-
.../mobile/activities/FlashScreenActivity.java | 19 +-
.../mobile/activities/LoginActivity.java | 122 +++++++++-
.../mobile/activities/SettingsActivity.java | 244 +++++++++++++++++++
.../activities/WorkflowDetailActivity.java | 3 +-
.../adapters/FavoriteWorkflowAdapter.java | 6 +-
.../mobile/adapters/SliderMenuAdapter.java | 18 +-
.../mobile/adapters/WorkflowAdapter.java | 56 ++++-
.../WorkflowDownloadReceiver.java | 4 +-
.../fragments/NavigationDrawerFragment.java | 1 +
.../mobile/fragments/WorkflowItemFragment.java | 114 +++++----
.../workflowdetails/WorkflowAboutFragment.java | 1 -
.../WorkflowRunHistoryFragment.java | 12 +-
.../workflowdetails/WorkflowdetailFragment.java | 241 +++++++++++++++++-
.../mobile/tavernamobile/TavernaPlayerAPI.java | 47 +++-
.../taverna/mobile/utils/DetailsLoader.java | 13 +-
.../mobile/utils/WorkflowDownloadManager.java | 10 +-
.../taverna/mobile/utils/WorkflowLoader.java | 12 +-
.../taverna/mobile/utils/WorkflowRunHelper.java | 30 ---
app/src/main/res/layout/fragment_item_grid.xml | 7 +-
app/src/main/res/layout/fragment_item_list.xml | 8 +-
app/src/main/res/layout/fragment_login.xml | 6 +
.../main/res/layout/fragment_workflow_about.xml | 1 -
.../res/layout/fragment_workflow_detail.xml | 3 +-
.../main/res/layout/workflow_item_layout.xml | 5 +-
app/src/main/res/layout/workflow_layout.xml | 5 +-
app/src/main/res/menu/dashboard_main.xml | 2 +-
.../main/res/mipmap-hdpi/ic_dashboard_home.png | Bin 0 -> 224 bytes
.../main/res/mipmap-mdpi/ic_dashboard_home.png | Bin 0 -> 273 bytes
.../main/res/mipmap-xhdpi/ic_dashboard_home.png | Bin 0 -> 371 bytes
.../res/mipmap-xxhdpi/ic_dashboard_home.png | Bin 0 -> 566 bytes
.../res/mipmap-xxxhdpi/ic_dashboard_home.png | Bin 0 -> 659 bytes
app/src/main/res/values/strings.xml | 8 +-
.../res/values/strings_activity_settings.xml | 22 ++
app/src/main/res/xml/pref_general.xml | 33 +++
app/src/main/res/xml/pref_headers.xml | 9 +
110 files changed, 1285 insertions(+), 391 deletions(-)
----------------------------------------------------------------------
[06/12] incubator-taverna-mobile git commit: Implemented app
preferences to configure Taverna player and server portals
Posted by ia...@apache.org.
Implemented app preferences to configure Taverna player and server portals
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/1fcf1fe6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/1fcf1fe6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/1fcf1fe6
Branch: refs/heads/master
Commit: 1fcf1fe647dc38b8c70e370111c65c754af933e9
Parents: 78ee0be
Author: larrytech7 <la...@gmail.com>
Authored: Tue Jun 16 16:43:37 2015 +0100
Committer: larrytech7 <la...@gmail.com>
Committed: Tue Jun 16 16:43:37 2015 +0100
----------------------------------------------------------------------
app/src/main/AndroidManifest.xml | 11 +-
app/src/main/ic_dashboard_home-web.png | Bin 0 -> 2121 bytes
.../activities/DashboardMainActivity.java | 11 +-
.../mobile/activities/SettingsActivity.java | 244 +++++++++++++++++++
.../mobile/adapters/SliderMenuAdapter.java | 18 +-
.../fragments/NavigationDrawerFragment.java | 1 +
.../workflowdetails/WorkflowAboutFragment.java | 1 -
.../workflowdetails/WorkflowdetailFragment.java | 7 +-
.../mobile/tavernamobile/TavernaPlayerAPI.java | 42 +++-
.../taverna/mobile/utils/DetailsLoader.java | 10 +-
.../taverna/mobile/utils/WorkflowRunHelper.java | 30 ---
.../main/res/mipmap-hdpi/ic_dashboard_home.png | Bin 0 -> 224 bytes
.../main/res/mipmap-mdpi/ic_dashboard_home.png | Bin 0 -> 273 bytes
.../main/res/mipmap-xhdpi/ic_dashboard_home.png | Bin 0 -> 371 bytes
.../res/mipmap-xxhdpi/ic_dashboard_home.png | Bin 0 -> 566 bytes
.../res/mipmap-xxxhdpi/ic_dashboard_home.png | Bin 0 -> 659 bytes
.../res/values/strings_activity_settings.xml | 22 ++
app/src/main/res/xml/pref_general.xml | 33 +++
app/src/main/res/xml/pref_headers.xml | 9 +
19 files changed, 380 insertions(+), 59 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/1fcf1fe6/app/src/main/AndroidManifest.xml
----------------------------------------------------------------------
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7db3bdb..5d1c634 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -67,9 +67,18 @@ limitations under the License.
android:enabled="true"
android:exported="true" >
<intent-filter>
- <action android:name="android.intent.action.DOWNLOAD_COMPLETE"/>
+ <action android:name="android.intent.action.DOWNLOAD_COMPLETE" />
</intent-filter>
</receiver>
+
+ <activity
+ android:name=".activities.SettingsActivity"
+ android:label="@string/title_activity_settings"
+ android:parentActivityName="org.apache.taverna.mobile.activities.DashboardMainActivity" >
+ <meta-data
+ android:name="android.support.PARENT_ACTIVITY"
+ android:value="org.apache.taverna.mobile.activities.DashboardMainActivity" />
+ </activity>
</application>
</manifest>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/1fcf1fe6/app/src/main/ic_dashboard_home-web.png
----------------------------------------------------------------------
diff --git a/app/src/main/ic_dashboard_home-web.png b/app/src/main/ic_dashboard_home-web.png
new file mode 100644
index 0000000..5810950
Binary files /dev/null and b/app/src/main/ic_dashboard_home-web.png differ
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/1fcf1fe6/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 5ff0640..7624082 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
@@ -110,7 +110,7 @@ public class DashboardMainActivity extends ActionBarActivity
// update the main content by replacing fragments
FragmentManager fragmentManager = getSupportFragmentManager();
switch(position+1){
- case 1:
+ case 1://return home
fragmentManager.beginTransaction()
.replace(R.id.container, WorkflowItemFragment.newInstance("param1", "param2"))
.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_CLOSE)
@@ -145,7 +145,11 @@ public class DashboardMainActivity extends ActionBarActivity
.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_OPEN)
.commit();
break;
- case 5: //logout user
+ case 5://open settings/preference activity
+ startActivity(new Intent(this, SettingsActivity.class));
+ overridePendingTransition(android.R.anim.slide_in_left,android.R.anim.slide_out_right);
+ break;
+ case 6: //logout user
this.finish();
break;
default:
@@ -178,6 +182,9 @@ public class DashboardMainActivity extends ActionBarActivity
mTitle = getString(R.string.title_about);
break;
case 5:
+ mTitle = getString(R.string.title_activity_settings);
+ break;
+ case 6:
mTitle = getString(R.string.title_exit);
break;
}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/1fcf1fe6/app/src/main/java/org/apache/taverna/mobile/activities/SettingsActivity.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/activities/SettingsActivity.java b/app/src/main/java/org/apache/taverna/mobile/activities/SettingsActivity.java
new file mode 100644
index 0000000..4a5048d
--- /dev/null
+++ b/app/src/main/java/org/apache/taverna/mobile/activities/SettingsActivity.java
@@ -0,0 +1,244 @@
+package org.apache.taverna.mobile.activities;
+/**
+ * Apache Taverna Mobile
+ * Copyright 2015 The Apache Software Foundation
+
+ * This product includes software developed at
+ * The Apache Software Foundation (http://www.apache.org/).
+
+ * 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.
+ */
+
+import android.annotation.TargetApi;
+import android.content.Context;
+import android.content.res.Configuration;
+import android.os.Build;
+import android.os.Bundle;
+import android.preference.ListPreference;
+import android.preference.Preference;
+import android.preference.PreferenceActivity;
+import android.preference.PreferenceFragment;
+import android.preference.PreferenceManager;
+import android.support.annotation.NonNull;
+import android.support.v4.app.NavUtils;
+import android.view.MenuItem;
+
+import org.apache.taverna.mobile.R;
+
+import java.util.List;
+
+/**
+ * A {@link PreferenceActivity} that presents a set of application settings. On
+ * handset devices, settings are presented as a single list. On tablets,
+ * settings are split by category, with category headers shown to the left of
+ * the list of settings.
+ * <p/>
+ * See <a href="http://developer.android.com/design/patterns/settings.html">
+ * Android Design: Settings</a> for design guidelines and the <a
+ * href="http://developer.android.com/guide/topics/ui/settings.html">Settings
+ * API Guide</a> for more information on developing a Settings UI.
+ */
+public class SettingsActivity extends PreferenceActivity {
+ /**
+ * Determines whether to always show the simplified settings UI, where
+ * settings are presented in a single list. When false, settings are shown
+ * as a master/detail two-pane view on tablets. When true, a single pane is
+ * shown on tablets.
+ */
+ private static final boolean ALWAYS_SIMPLE_PREFS = false;
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ // setupActionBar();
+ }
+
+ /**
+ * Set up the {@link android.app.ActionBar}, if the API is available.
+ */
+ /* @NonNull
+ @TargetApi(Build.VERSION_CODES.HONEYCOMB)
+ private void setupActionBar() {
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
+ // Show the Up button in the action bar.
+ getActionBar().setDisplayHomeAsUpEnabled(true);
+ }
+ }
+*/
+ @Override
+ public boolean onOptionsItemSelected(MenuItem item) {
+ int id = item.getItemId();
+ if (id == android.R.id.home) {
+ // This ID represents the Home or Up button. In the case of this
+ // activity, the Up button is shown. Use NavUtils to allow users
+ // to navigate up one level in the application structure. For
+ // more details, see the Navigation pattern on Android Design:
+ //
+ // http://developer.android.com/design/patterns/navigation.html#up-vs-back
+ //
+ // TODO: If Settings has multiple levels, Up should navigate up
+ // that hierarchy.
+ NavUtils.navigateUpFromSameTask(this);
+ return true;
+ }
+ return super.onOptionsItemSelected(item);
+ }
+
+ @Override
+ protected void onPostCreate(Bundle savedInstanceState) {
+ super.onPostCreate(savedInstanceState);
+
+ setupSimplePreferencesScreen();
+ }
+
+ /**
+ * Shows the simplified settings UI if the device configuration if the
+ * device configuration dictates that a simplified, single-pane UI should be
+ * shown.
+ */
+ private void setupSimplePreferencesScreen() {
+ if (!isSimplePreferences(this)) {
+ return;
+ }
+
+ // In the simplified UI, fragments are not used at all and we instead
+ // use the older PreferenceActivity APIs.
+
+ // Add 'general' preferences.
+ addPreferencesFromResource(R.xml.pref_general);
+
+ // Bind the summaries of EditText/List/Dialog/Ringtone preferences to
+ // their values. When their values change, their summaries are updated
+ // to reflect the new value, per the Android Design guidelines.
+ bindPreferenceSummaryToValue(findPreference("pref_server_url"));
+ bindPreferenceSummaryToValue(findPreference("pref_player_url"));
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean onIsMultiPane() {
+ return isXLargeTablet(this) && !isSimplePreferences(this);
+ }
+
+ /**
+ * Helper method to determine if the device has an extra-large screen. For
+ * example, 10" tablets are extra-large.
+ */
+ private static boolean isXLargeTablet(Context context) {
+ return (context.getResources().getConfiguration().screenLayout
+ & Configuration.SCREENLAYOUT_SIZE_MASK) >= Configuration.SCREENLAYOUT_SIZE_XLARGE;
+ }
+
+ /**
+ * Determines whether the simplified settings UI should be shown. This is
+ * true if this is forced via {@link #ALWAYS_SIMPLE_PREFS}, or the device
+ * doesn't have newer APIs like {@link PreferenceFragment}, or the device
+ * doesn't have an extra-large screen. In these cases, a single-pane
+ * "simplified" settings UI should be shown.
+ */
+ private static boolean isSimplePreferences(Context context) {
+ return ALWAYS_SIMPLE_PREFS
+ || Build.VERSION.SDK_INT < Build.VERSION_CODES.HONEYCOMB
+ || !isXLargeTablet(context);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ @TargetApi(Build.VERSION_CODES.HONEYCOMB)
+ public void onBuildHeaders(List<Header> target) {
+ if (!isSimplePreferences(this)) {
+ loadHeadersFromResource(R.xml.pref_headers, target);
+ }
+ }
+
+ /**
+ * A preference value change listener that updates the preference's summary
+ * to reflect its new value.
+ */
+ private static Preference.OnPreferenceChangeListener sBindPreferenceSummaryToValueListener = new Preference.OnPreferenceChangeListener() {
+ @Override
+ public boolean onPreferenceChange(Preference preference, Object value) {
+ String stringValue = value.toString();
+
+ if (preference instanceof ListPreference) {
+ // For list preferences, look up the correct display value in
+ // the preference's 'entries' list.
+ ListPreference listPreference = (ListPreference) preference;
+ int index = listPreference.findIndexOfValue(stringValue);
+
+ // Set the summary to reflect the new value.
+ preference.setSummary(
+ index >= 0
+ ? listPreference.getEntries()[index]
+ : null);
+
+ } else {
+ // For all other preferences, set the summary to the value's
+ // simple string representation.
+ preference.setSummary(stringValue);
+ }
+ return true;
+ }
+ };
+
+ /**
+ * Binds a preference's summary to its value. More specifically, when the
+ * preference's value is changed, its summary (line of text below the
+ * preference title) is updated to reflect the value. The summary is also
+ * immediately updated upon calling this method. The exact display format is
+ * dependent on the type of preference.
+ *
+ * @see #sBindPreferenceSummaryToValueListener
+ */
+ private static void bindPreferenceSummaryToValue(Preference preference) {
+ // Set the listener to watch for value changes.
+ preference.setOnPreferenceChangeListener(sBindPreferenceSummaryToValueListener);
+
+ // Trigger the listener immediately with the preference's
+ // current value.
+ sBindPreferenceSummaryToValueListener.onPreferenceChange(preference,
+ PreferenceManager
+ .getDefaultSharedPreferences(preference.getContext())
+ .getString(preference.getKey(), ""));
+ }
+
+ /**
+ * This fragment shows general preferences only. It is used when the
+ * activity is showing a two-pane settings UI.
+ */
+ @TargetApi(Build.VERSION_CODES.HONEYCOMB)
+ public static class GeneralPreferenceFragment extends PreferenceFragment {
+ @Override
+ public void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ addPreferencesFromResource(R.xml.pref_general);
+
+ // Bind the summaries of EditText/List/Dialog/Ringtone preferences
+ // to their values. When their values change, their summaries are
+ // updated to reflect the new value, per the Android Design
+ // guidelines.
+ bindPreferenceSummaryToValue(findPreference("pref_server_url"));
+ bindPreferenceSummaryToValue(findPreference("pref_player_url"));
+ }
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/1fcf1fe6/app/src/main/java/org/apache/taverna/mobile/adapters/SliderMenuAdapter.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/adapters/SliderMenuAdapter.java b/app/src/main/java/org/apache/taverna/mobile/adapters/SliderMenuAdapter.java
index 9a68189..9b702a1 100644
--- a/app/src/main/java/org/apache/taverna/mobile/adapters/SliderMenuAdapter.java
+++ b/app/src/main/java/org/apache/taverna/mobile/adapters/SliderMenuAdapter.java
@@ -68,22 +68,12 @@ public class SliderMenuAdapter extends BaseAdapter{
public View getView(int i, View view, ViewGroup viewGroup) {
View menuitemview = LayoutInflater.from(context).inflate(R.layout.menu_item_layout, viewGroup, false);
- /* if(view != null ) {
- ViewHolder vh = (ViewHolder) view.getTag();
- if (vh == null) {
- ViewHolder v = new ViewHolder(menuitemview);
- view.setTag(v);
- return getView(i,view,viewGroup);
- } else {
- vh.menuitem.setText(dataItems.get(i));
- vh.menuicon.setImageResource(R.drawable.gear_icon);
- }
- }*/
+
ImageView menuicon = (ImageView) menuitemview.findViewById(R.id.menuIcon);
TextView menuitem = (TextView) menuitemview.findViewById(R.id.menuItemText);
switch(i +1){
case 1:
- menuicon.setImageResource(R.mipmap.ic_workflows);
+ menuicon.setImageResource(R.mipmap.ic_dashboard_home);
menuitem.setText(dataItems.get(i));
break;
case 2:
@@ -99,6 +89,10 @@ public class SliderMenuAdapter extends BaseAdapter{
menuitem.setText(dataItems.get(i));
break;
case 5:
+ menuicon.setImageResource(R.mipmap.ic_workflows);
+ menuitem.setText(dataItems.get(i));
+ break;
+ case 6:
menuicon.setImageResource(R.mipmap.ic_logout);
menuitem.setText(dataItems.get(i));
break;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/1fcf1fe6/app/src/main/java/org/apache/taverna/mobile/fragments/NavigationDrawerFragment.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/fragments/NavigationDrawerFragment.java b/app/src/main/java/org/apache/taverna/mobile/fragments/NavigationDrawerFragment.java
index e936d1e..f3aaed0 100644
--- a/app/src/main/java/org/apache/taverna/mobile/fragments/NavigationDrawerFragment.java
+++ b/app/src/main/java/org/apache/taverna/mobile/fragments/NavigationDrawerFragment.java
@@ -138,6 +138,7 @@ public class NavigationDrawerFragment extends Fragment {
mlist.add(getString(R.string.title_openworkflow));
mlist.add(getString(R.string.title_usage));
mlist.add(getString(R.string.title_about));
+ mlist.add(getString(R.string.title_activity_settings));
mlist.add(getString(R.string.title_exit));
mDrawerListView.setAdapter(new SliderMenuAdapter(getActivity(), mlist));
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/1fcf1fe6/app/src/main/java/org/apache/taverna/mobile/fragments/workflowdetails/WorkflowAboutFragment.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/fragments/workflowdetails/WorkflowAboutFragment.java b/app/src/main/java/org/apache/taverna/mobile/fragments/workflowdetails/WorkflowAboutFragment.java
index e54cdaf..c8f1e64 100644
--- a/app/src/main/java/org/apache/taverna/mobile/fragments/workflowdetails/WorkflowAboutFragment.java
+++ b/app/src/main/java/org/apache/taverna/mobile/fragments/workflowdetails/WorkflowAboutFragment.java
@@ -84,5 +84,4 @@ public class WorkflowAboutFragment extends Fragment {
return inflater.inflate(R.layout.fragment_workflow_about, container, false);
}
-
}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/1fcf1fe6/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 656ea90..3068791 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
@@ -246,7 +246,7 @@ public class WorkflowdetailFragment extends Fragment implements View.OnClickList
StringBuffer sb = new StringBuffer();
try {
- URL workflowurl = new URL(TavernaPlayerAPI.PLAYER_RUN_FRAMEWORK_URL+params[0]);
+ URL workflowurl = new URL(new TavernaPlayerAPI(this.context).PLAYER_RUN_FRAMEWORK_URL+params[0]);
HttpURLConnection connection = (HttpURLConnection) workflowurl.openConnection();
String userpass = "icep603@gmail.com" + ":" + "creationfox";
String basicAuth = "Basic " + Base64.encodeToString(userpass.getBytes(), Base64.DEFAULT);
@@ -359,6 +359,8 @@ public class WorkflowdetailFragment extends Fragment implements View.OnClickList
@Override
protected void onPreExecute() {
super.onPreExecute();
+ progressDialog.setMessage("Creating new run for the workflow");
+ progressDialog.show();
}
@Override
@@ -366,7 +368,7 @@ public class WorkflowdetailFragment extends Fragment implements View.OnClickList
StringBuffer sb = new StringBuffer();
try {
- URL workflowurl = new URL(TavernaPlayerAPI.PLAYER_RUN_URL);
+ URL workflowurl = new URL(new TavernaPlayerAPI(this.context).PLAYER_RUN_URL);
HttpURLConnection connection = (HttpURLConnection) workflowurl.openConnection();
String userpass = "icep603@gmail.com" + ":" + "creationfox";
String basicAuth = "Basic " + Base64.encodeToString(userpass.getBytes(), Base64.DEFAULT);
@@ -409,6 +411,7 @@ public class WorkflowdetailFragment extends Fragment implements View.OnClickList
@Override
protected void onPostExecute(String s) {
Log.i("RUN OutPut", s);
+ progressDialog.dismiss();
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/1fcf1fe6/app/src/main/java/org/apache/taverna/mobile/tavernamobile/TavernaPlayerAPI.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/tavernamobile/TavernaPlayerAPI.java b/app/src/main/java/org/apache/taverna/mobile/tavernamobile/TavernaPlayerAPI.java
index 85874a8..9697fb8 100644
--- a/app/src/main/java/org/apache/taverna/mobile/tavernamobile/TavernaPlayerAPI.java
+++ b/app/src/main/java/org/apache/taverna/mobile/tavernamobile/TavernaPlayerAPI.java
@@ -1,5 +1,8 @@
package org.apache.taverna.mobile.tavernamobile;
+import android.content.Context;
+import android.preference.PreferenceManager;
+
import java.net.PasswordAuthentication;
/**
@@ -7,14 +10,41 @@ import java.net.PasswordAuthentication;
*/
public class TavernaPlayerAPI {
- public static final String PLAYER_BASE_URL = "http://heater.cs.man.ac.uk:3000/";
- public static final String SERVER_BASE_URL = "http://heater.cs.man.ac.uk:8090/taverna-2.5.4/";
- public static final String PLAYER_WORKFLOW_URL = PLAYER_BASE_URL+"workflows/";
- public static final String PLAYER_RUN_URL = PLAYER_BASE_URL+"runs/";
- public static final String PLAYER_RUN_FRAMEWORK_URL = PLAYER_RUN_URL+"new?workflow_id="; //returns a json 'framework' used for creating runs for the given workflow
+ public static String PLAYER_BASE_URL = "http://heater.cs.man.ac.uk:3000/";
+ public static String SERVER_BASE_URL = "http://heater.cs.man.ac.uk:8090/taverna-2.5.4/";
+ public static String PLAYER_WORKFLOW_URL = PLAYER_BASE_URL+"workflows/";
+ public static String PLAYER_RUN_URL = PLAYER_BASE_URL+"runs/";
+ public static String PLAYER_RUN_FRAMEWORK_URL = PLAYER_RUN_URL+"new?workflow_id="; //returns a json 'framework' used for creating runs for the given workflow
+
+
+ public TavernaPlayerAPI(Context context) {
+ String server = PreferenceManager.getDefaultSharedPreferences(context).getString("pref_server_url","/");
+ String player = PreferenceManager.getDefaultSharedPreferences(context).getString("pref_player_url","/");
+ PLAYER_BASE_URL = player;
+ SERVER_BASE_URL = server;
+ PLAYER_WORKFLOW_URL = PLAYER_BASE_URL+"workflows/";
+ PLAYER_RUN_URL = PLAYER_BASE_URL+"runs/";
+ PLAYER_RUN_FRAMEWORK_URL = PLAYER_RUN_URL+"new?workflow_id=";
+ }
+
+ public static String getPLAYER_BASE_URL() {
+ return PLAYER_BASE_URL;
+ }
+ public static String getSERVER_BASE_URL() {
+ return SERVER_BASE_URL;
+ }
+
+ public static String getPLAYER_WORKFLOW_URL() {
+ return PLAYER_WORKFLOW_URL;
+ }
+
+ public static String getPLAYER_RUN_URL() {
+ return PLAYER_RUN_URL;
+ }
- public TavernaPlayerAPI() {
+ public static String getPLAYER_RUN_FRAMEWORK_URL() {
+ return PLAYER_RUN_FRAMEWORK_URL;
}
public static class Authenticator extends java.net.Authenticator{
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/1fcf1fe6/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 08d69bf..f0998fc 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
@@ -75,19 +75,19 @@ public class DetailsLoader extends AsyncTaskLoader<Workflow> {
switch (this.lt){
case TYPE_WORKFLOW_DETAIL:
- workflowurl = new URL(TavernaPlayerAPI.PLAYER_WORKFLOW_URL+this.wid);
+ workflowurl = new URL(new TavernaPlayerAPI(this.context).PLAYER_WORKFLOW_URL+this.wid);
break;
case TYPE_RUN_HISTORY:
- workflowurl = new URL(TavernaPlayerAPI.PLAYER_RUN_URL);
+ workflowurl = new URL(new TavernaPlayerAPI(this.context).PLAYER_RUN_URL);
break;
case TYPE_POLICY:
- workflowurl = new URL(TavernaPlayerAPI.SERVER_BASE_URL);
+ workflowurl = new URL(new TavernaPlayerAPI(this.context).SERVER_BASE_URL);
break;
case TYPE_ABOUT_WORKFLOW:
- workflowurl = new URL(TavernaPlayerAPI.PLAYER_WORKFLOW_URL);
+ workflowurl = new URL(new TavernaPlayerAPI(this.context).PLAYER_WORKFLOW_URL);
break;
default:
- workflowurl = new URL(TavernaPlayerAPI.PLAYER_WORKFLOW_URL);
+ workflowurl = new URL(new TavernaPlayerAPI(this.context).PLAYER_WORKFLOW_URL);
break;
}
HttpURLConnection connection = (HttpURLConnection) workflowurl.openConnection();
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/1fcf1fe6/app/src/main/java/org/apache/taverna/mobile/utils/WorkflowRunHelper.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/utils/WorkflowRunHelper.java b/app/src/main/java/org/apache/taverna/mobile/utils/WorkflowRunHelper.java
deleted file mode 100644
index f450bca..0000000
--- a/app/src/main/java/org/apache/taverna/mobile/utils/WorkflowRunHelper.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package org.apache.taverna.mobile.utils;
-/**
- * Apache Taverna Mobile
- * Copyright 2015 The Apache Software Foundation
-
- * This product includes software developed at
- * The Apache Software Foundation (http://www.apache.org/).
-
- * 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.
- */
-/**
- * Created by root on 6/11/15.
- */
-public class WorkflowRunHelper {
-}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/1fcf1fe6/app/src/main/res/mipmap-hdpi/ic_dashboard_home.png
----------------------------------------------------------------------
diff --git a/app/src/main/res/mipmap-hdpi/ic_dashboard_home.png b/app/src/main/res/mipmap-hdpi/ic_dashboard_home.png
new file mode 100644
index 0000000..841a7b4
Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_dashboard_home.png differ
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/1fcf1fe6/app/src/main/res/mipmap-mdpi/ic_dashboard_home.png
----------------------------------------------------------------------
diff --git a/app/src/main/res/mipmap-mdpi/ic_dashboard_home.png b/app/src/main/res/mipmap-mdpi/ic_dashboard_home.png
new file mode 100644
index 0000000..373ae1f
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_dashboard_home.png differ
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/1fcf1fe6/app/src/main/res/mipmap-xhdpi/ic_dashboard_home.png
----------------------------------------------------------------------
diff --git a/app/src/main/res/mipmap-xhdpi/ic_dashboard_home.png b/app/src/main/res/mipmap-xhdpi/ic_dashboard_home.png
new file mode 100644
index 0000000..d41aa64
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_dashboard_home.png differ
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/1fcf1fe6/app/src/main/res/mipmap-xxhdpi/ic_dashboard_home.png
----------------------------------------------------------------------
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_dashboard_home.png b/app/src/main/res/mipmap-xxhdpi/ic_dashboard_home.png
new file mode 100644
index 0000000..f197418
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_dashboard_home.png differ
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/1fcf1fe6/app/src/main/res/mipmap-xxxhdpi/ic_dashboard_home.png
----------------------------------------------------------------------
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_dashboard_home.png b/app/src/main/res/mipmap-xxxhdpi/ic_dashboard_home.png
new file mode 100644
index 0000000..08e4ec6
Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_dashboard_home.png differ
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/1fcf1fe6/app/src/main/res/values/strings_activity_settings.xml
----------------------------------------------------------------------
diff --git a/app/src/main/res/values/strings_activity_settings.xml b/app/src/main/res/values/strings_activity_settings.xml
new file mode 100644
index 0000000..9469b98
--- /dev/null
+++ b/app/src/main/res/values/strings_activity_settings.xml
@@ -0,0 +1,22 @@
+<resources>
+ <string name="title_activity_settings">Settings</string>
+
+ <!-- Strings related to Settings -->
+
+ <!-- Example General settings -->
+ <string name="pref_header_general">General</string>
+
+ <!-- Login status info-->
+ <string name="pref_remainLogged_in">Remain Logged-in</string>
+ <string name="pref_login_description">Decide whether or not to be automatically logged-in when next the app starts</string>
+ <!-- Player Portal url info -->
+ <string name="pref_player_default"> http://heater.cs.man.ac.uk:3000/</string> <!-- default value -->
+ <string name="pref_player_title">Configure Taverna player portal</string>
+ <string name="pref_player_des">Configure a different player URL for the app to use. End with the mount point(/)</string>
+
+ <!-- Server Portal url info -->
+ <string name="pref_server_default"> http://heater.cs.man.ac.uk:8090/taverna-2.5.4/</string> <!-- default value -->
+ <string name="pref_server_title">Configure Taverna Server </string>
+ <string name="pref_server_des">Configure a different Taverna Server for the app</string>
+
+</resources>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/1fcf1fe6/app/src/main/res/xml/pref_general.xml
----------------------------------------------------------------------
diff --git a/app/src/main/res/xml/pref_general.xml b/app/src/main/res/xml/pref_general.xml
new file mode 100644
index 0000000..cfa5985
--- /dev/null
+++ b/app/src/main/res/xml/pref_general.xml
@@ -0,0 +1,33 @@
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <CheckBoxPreference
+ android:key="pref_logged_in"
+ android:title="@string/pref_remainLogged_in"
+ android:summary="@string/pref_login_description"
+ android:defaultValue="true" />
+
+ <!-- NOTE: EditTextPreference accepts EditText attributes. -->
+ <!-- NOTE: EditTextPreference's summary should be set to its value by the activity code. -->
+ <EditTextPreference
+ android:key="pref_player_url"
+ android:title="@string/pref_player_title"
+ android:summary="@string/pref_player_des"
+ android:defaultValue="@string/pref_player_default"
+ android:selectAllOnFocus="true"
+ android:inputType="textCapWords"
+ android:capitalize="words"
+ android:singleLine="true"
+ android:maxLines="1" />
+ <EditTextPreference
+ android:key="pref_server_url"
+ android:title="@string/pref_server_title"
+ android:summary="@string/pref_server_des"
+ android:defaultValue="@string/pref_server_default"
+ android:selectAllOnFocus="true"
+ android:inputType="textCapWords"
+ android:capitalize="words"
+ android:singleLine="true"
+ android:maxLines="1" />
+
+
+</PreferenceScreen>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/1fcf1fe6/app/src/main/res/xml/pref_headers.xml
----------------------------------------------------------------------
diff --git a/app/src/main/res/xml/pref_headers.xml b/app/src/main/res/xml/pref_headers.xml
new file mode 100644
index 0000000..e50e89f
--- /dev/null
+++ b/app/src/main/res/xml/pref_headers.xml
@@ -0,0 +1,9 @@
+<preference-headers xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <!-- These settings headers are only used on tablets. -->
+
+ <header
+ android:fragment="org.apache.taverna.mobile.activities.SettingsActivity$GeneralPreferenceFragment"
+ android:title="@string/pref_header_general" />
+
+</preference-headers>
[09/12] incubator-taverna-mobile git commit: implemented workflow
search by author and title
Posted by ia...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/05a2c718/app/build/intermediates/incremental/mergeResources/debug/merger.xml
----------------------------------------------------------------------
diff --git a/app/build/intermediates/incremental/mergeResources/debug/merger.xml b/app/build/intermediates/incremental/mergeResources/debug/merger.xml
index d72acfb..7178d1f 100644
--- a/app/build/intermediates/incremental/mergeResources/debug/merger.xml
+++ b/app/build/intermediates/incremental/mergeResources/debug/merger.xml
@@ -1626,11 +1626,11 @@
<item name="android:listChoiceIndicatorMultiple">@drawable/abc_btn_check_material</item>
</style></file></source></dataSet><dataSet config="main"><source path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res"><file path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/values/styles.xml" qualifiers=""><style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
<!-- Customize your theme here. -->
- </style></file><file path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/values/dimens.xml" qualifiers=""><dimen name="activity_vertical_margin">16dp</dimen><dimen name="activity_horizontal_margin">16dp</dimen><dimen name="navigation_drawer_width">240dp</dimen></file><file path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/values/refs.xml" qualifiers=""><item name="fragment_item" type="layout">@layout/fragment_item_list</item></file><file path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/values/strings.xml" qualifiers=""><string name="downloadfailed">Download Failed. Please try again</string><string name="downloadduplicate">Already Downloading</string><string name="workflow_mark">Favorite</string><string name="downloadprogress">Workflow download in progress</string><string name="title_usage">Usage</string><string name="wktitle">TITLE</string><string name="title_favorite">Favorites</string><array name="workflow_info">
+ </style></file><file path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/values/dimens.xml" qualifiers=""><dimen name="activity_vertical_margin">16dp</dimen><dimen name="activity_horizontal_margin">16dp</dimen><dimen name="navigation_drawer_width">240dp</dimen></file><file path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/values/refs.xml" qualifiers=""><item name="fragment_item" type="layout">@layout/fragment_item_list</item></file><file path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/values/strings.xml" qualifiers=""><string name="downloadfailed">Download Failed. Please try again</string><string name="emailerr">Email must not be empty</string><string name="fetchrun">Fetching run components </string><string name="downloadduplicate">Already Downloading</string><string name="workflow_mark">Favorite</string><string name="downloadprogress">Workflow download in progress</string><string name="title_usage">Usage</string><string name="wktitle">TITL
E</string><string name="title_favorite">Favorites</string><array name="workflow_info">
<item>Date Created</item>
<item>Date Modified</item>
<item>Date Last Run</item>
- </array><string name="detail_title_section1">Workflow </string><string name="detail_title_section4"> About </string><string name="detail_title_section2">Run History</string><string name="downloadcomplete"> download complete</string><string name="completebrand">Powered By Apache Taverna</string><string name="detail_title_section3">Licence | Policy</string><string name="loginpassword">Password</string><string name="menu_search">Search</string><string name="title_activity_dashboard_main">Dashboard</string><string name="title_about">About </string><string name="search_hint"> Search workflows by name</string><string name="title_activity_flash_screen">Taverna Mobile</string><string name="Logininfo">Login to your Account</string><string name="action_example">Example action</string><string name="hello_blank_fragment"> About Workflow </string><string name="workflow_authorhint">Workflow Author</string><string name="description">Workflow Description</string><string name="navigation_drawer
_close">Close navigation drawer</string><string name="play_workflow">Create Run</string><string name="title_explore">Workflows</string><string name="loginbutton">Login</string><string name="seemore"> See more &raquo</string><string name="created">Created :</string><string name="marked">Marked On</string><string name="loading">Loading details</string><string name="title_activity_workflow_detail">Workflow Detail</string><string name="title_openworkflow">Open Workflow</string><string name="workflow_component">Workflow component</string><string name="navigation_drawer_open">Open navigation drawer</string><string name="workflow_read">View</string><string name="hello_world"> Empty </string><string name="favorite_empty"> No Favorites Added Yet</string><string-array name="menus">
+ </array><string name="detail_title_section1">Workflow </string><string name="detail_title_section4"> About </string><string name="detail_title_section2">Run History</string><string name="downloadcomplete"> download complete</string><string name="completebrand">Powered By Apache Taverna</string><string name="detail_title_section3">Licence | Policy</string><string name="loginpassword">Password</string><string name="menu_search">Search</string><string name="title_activity_dashboard_main">Dashboard</string><string name="title_about">About </string><string name="search_hint"> Search workflows by name</string><string name="passworderr">Password must not be empty</string><string name="title_activity_flash_screen">Taverna Mobile</string><string name="Logininfo">Login to your Account</string><string name="action_example">Example action</string><string name="hello_blank_fragment"> About Workflow </string><string name="workflow_authorhint">Workflow Author </string><string name="descripti
on">Workflow Description</string><string name="navigation_drawer_close">Close navigation drawer</string><string name="play_workflow">Create Run</string><string name="title_explore">Workflows</string><string name="loginbutton">Login</string><string name="seemore"> See more &raquo</string><string name="loadworkflows">Loading Workflows</string><string name="created">Created :</string><string name="marked">Marked On</string><string name="keeplogin">Remain Logged-in</string><string name="loading">Loading details</string><string name="title_activity_workflow_detail">Workflow Detail</string><string name="title_openworkflow">Open Workflow</string><string name="workflow_component">Workflow component</string><string name="navigation_drawer_open">Open navigation drawer</string><string name="workflow_read">View</string><string name="hello_world"> Empty </string><string name="favorite_empty"> No Favorites Added Yet</string><string-array name="menus">
<item>Usage</item>
<item>Quit</item>
- </string-array><string name="action_settings">Settings</string><string name="app_name">TavernaMobile</string><string name="brand">Powered By</string><string name="workflow_download">Download</string><string name="modified">Modified :</string><string name="workflow_empty"> No <b>Workflows</b> Available. Check your Connection to the Internet</string><string name="downloaderror">Unable to start Download. Check your internet connectivity</string><string name="loginusername">Email or Username</string><string name="title_exit">Logout</string></file><file name="ic_markworkflow_selected" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/mipmap-mdpi/ic_markworkflow_selected.png" qualifiers="mdpi-v4" type="mipmap"/><file name="ic_workflows" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/mipmap-mdpi/ic_workflows.png" qualifiers="mdpi-v4" type="mipmap"/><file name="ic_usage" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/mipmap-mdpi/ic_usage.png"
qualifiers="mdpi-v4" type="mipmap"/><file name="ic_viewworkflow" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/mipmap-mdpi/ic_viewworkflow.png" qualifiers="mdpi-v4" type="mipmap"/><file name="icuserprofiles" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/mipmap-mdpi/icuserprofiles.png" qualifiers="mdpi-v4" type="mipmap"/><file name="ic_poweredby" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/mipmap-mdpi/ic_poweredby.png" qualifiers="mdpi-v4" type="mipmap"/><file name="ic_logout" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/mipmap-mdpi/ic_logout.png" qualifiers="mdpi-v4" type="mipmap"/><file name="ic_launcher" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/mipmap-mdpi/ic_launcher.png" qualifiers="mdpi-v4" type="mipmap"/><file name="ic_user" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/mipmap-mdpi/ic_user.png" qualifiers="mdpi-v4" type="mipmap"/><file name="ic_quit" path="/root/Deskt
op/AndroidLab/TavernaMobile2/app/src/main/res/mipmap-mdpi/ic_quit.png" qualifiers="mdpi-v4" type="mipmap"/><file name="ic_about" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/mipmap-mdpi/ic_about.png" qualifiers="mdpi-v4" type="mipmap"/><file name="ic_markworkflow_unselected" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/mipmap-mdpi/ic_markworkflow_unselected.png" qualifiers="mdpi-v4" type="mipmap"/><file name="ic_openwk" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/mipmap-mdpi/ic_openwk.png" qualifiers="mdpi-v4" type="mipmap"/><file name="searchable" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/xml/searchable.xml" qualifiers="" type="xml"/><file path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/values-sw600dp/refs.xml" qualifiers="sw600dp-v13"><item name="fragment_item" type="layout">@layout/fragment_item_grid</item></file><file path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/values-sw
600dp/strings.xml" qualifiers="sw600dp-v13"><string name="completebrand">Powered By Apache Taverna</string></file><file name="workflow_layout" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/layout/workflow_layout.xml" qualifiers="" type="layout"/><file name="activity_flash_screen" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/layout/activity_flash_screen.xml" qualifiers="" type="layout"/><file name="fragment_login" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/layout/fragment_login.xml" qualifiers="" type="layout"/><file name="fragment_item_list" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/layout/fragment_item_list.xml" qualifiers="" type="layout"/><file name="fragment_workflow_detail" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/layout/fragment_workflow_detail.xml" qualifiers="" type="layout"/><file name="fragment_item_grid" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/layout/fr
agment_item_grid.xml" qualifiers="" type="layout"/><file name="fragment_workflow_run_history" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/layout/fragment_workflow_run_history.xml" qualifiers="" type="layout"/><file name="fragment_navigation_drawer" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/layout/fragment_navigation_drawer.xml" qualifiers="" type="layout"/><file name="menu_item_layout" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/layout/menu_item_layout.xml" qualifiers="" type="layout"/><file name="activity_login" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/layout/activity_login.xml" qualifiers="" type="layout"/><file name="activity_dashboard_main" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/layout/activity_dashboard_main.xml" qualifiers="" type="layout"/><file name="activity_workflow_detail" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/layout/activity_workflow_detail.xm
l" qualifiers="" type="layout"/><file name="workflow_item_layout" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/layout/workflow_item_layout.xml" qualifiers="" type="layout"/><file name="fragment_workflow_about" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/layout/fragment_workflow_about.xml" qualifiers="" type="layout"/><file name="fragment_workflow_licence" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/layout/fragment_workflow_licence.xml" qualifiers="" type="layout"/><file name="fragment_dashboard_main" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/layout/fragment_dashboard_main.xml" qualifiers="" type="layout"/><file name="favorite_item_layout" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/layout/favorite_item_layout.xml" qualifiers="" type="layout"/><file name="fragment_login" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/layout-xlarge/fragment_login.xml" qualifiers="xlarge-v4"
type="layout"/><file path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/values-w820dp/dimens.xml" qualifiers="w820dp-v13"><dimen name="activity_horizontal_margin">64dp</dimen></file><file path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/values-w820dp/strings.xml" qualifiers="w820dp-v13"><string name="completebrand">Powered By Apache Taverna</string></file><file name="activity_dashboard_main" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/layout-land/activity_dashboard_main.xml" qualifiers="land" type="layout"/><file name="drawer_shadow" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/drawable-xxhdpi/drawer_shadow.9.png" qualifiers="xxhdpi-v4" type="drawable"/><file name="ic_drawer" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/drawable-xxhdpi/ic_drawer.png" qualifiers="xxhdpi-v4" type="drawable"/><file name="ic_markworkflow_selected" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/mipmap-hdpi/ic
_markworkflow_selected.png" qualifiers="hdpi-v4" type="mipmap"/><file name="ic_workflows" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/mipmap-hdpi/ic_workflows.png" qualifiers="hdpi-v4" type="mipmap"/><file name="ic_usage" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/mipmap-hdpi/ic_usage.png" qualifiers="hdpi-v4" type="mipmap"/><file name="ic_viewworkflow" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/mipmap-hdpi/ic_viewworkflow.png" qualifiers="hdpi-v4" type="mipmap"/><file name="icuserprofiles" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/mipmap-hdpi/icuserprofiles.png" qualifiers="hdpi-v4" type="mipmap"/><file name="ic_poweredby" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/mipmap-hdpi/ic_poweredby.png" qualifiers="hdpi-v4" type="mipmap"/><file name="ic_logout" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/mipmap-hdpi/ic_logout.png" qualifiers="hdpi-v4" type="mipmap"/><file n
ame="ic_launcher" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/mipmap-hdpi/ic_launcher.png" qualifiers="hdpi-v4" type="mipmap"/><file name="ic_user" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/mipmap-hdpi/ic_user.png" qualifiers="hdpi-v4" type="mipmap"/><file name="ic_quit" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/mipmap-hdpi/ic_quit.png" qualifiers="hdpi-v4" type="mipmap"/><file name="ic_about" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/mipmap-hdpi/ic_about.png" qualifiers="hdpi-v4" type="mipmap"/><file name="ic_markworkflow_unselected" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/mipmap-hdpi/ic_markworkflow_unselected.png" qualifiers="hdpi-v4" type="mipmap"/><file name="ic_openwk" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/mipmap-hdpi/ic_openwk.png" qualifiers="hdpi-v4" type="mipmap"/><file name="ic_markworkflow_selected" path="/root/Desktop/AndroidLab/TavernaMobile
2/app/src/main/res/mipmap-xxhdpi/ic_markworkflow_selected.png" qualifiers="xxhdpi-v4" type="mipmap"/><file name="ic_workflows" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/mipmap-xxhdpi/ic_workflows.png" qualifiers="xxhdpi-v4" type="mipmap"/><file name="ic_usage" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/mipmap-xxhdpi/ic_usage.png" qualifiers="xxhdpi-v4" type="mipmap"/><file name="ic_viewworkflow" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/mipmap-xxhdpi/ic_viewworkflow.png" qualifiers="xxhdpi-v4" type="mipmap"/><file name="icuserprofiles" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/mipmap-xxhdpi/icuserprofiles.png" qualifiers="xxhdpi-v4" type="mipmap"/><file name="ic_poweredby" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/mipmap-xxhdpi/ic_poweredby.png" qualifiers="xxhdpi-v4" type="mipmap"/><file name="ic_logout" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/mipmap-xxhdpi
/ic_logout.png" qualifiers="xxhdpi-v4" type="mipmap"/><file name="ic_launcher" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/mipmap-xxhdpi/ic_launcher.png" qualifiers="xxhdpi-v4" type="mipmap"/><file name="ic_user" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/mipmap-xxhdpi/ic_user.png" qualifiers="xxhdpi-v4" type="mipmap"/><file name="ic_quit" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/mipmap-xxhdpi/ic_quit.png" qualifiers="xxhdpi-v4" type="mipmap"/><file name="ic_about" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/mipmap-xxhdpi/ic_about.png" qualifiers="xxhdpi-v4" type="mipmap"/><file name="ic_markworkflow_unselected" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/mipmap-xxhdpi/ic_markworkflow_unselected.png" qualifiers="xxhdpi-v4" type="mipmap"/><file name="ic_openwk" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/mipmap-xxhdpi/ic_openwk.png" qualifiers="xxhdpi-v4" type="mipmap
"/><file name="sliding_header" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/drawable/sliding_header.png" qualifiers="" type="drawable"/><file name="gear_icon" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/drawable/gear_icon.png" qualifiers="" type="drawable"/><file name="downloadwk" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/drawable/downloadwk.png" qualifiers="" type="drawable"/><file name="round_shape" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/drawable/round_shape.xml" qualifiers="" type="drawable"/><file name="download" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/drawable/download.jpg" qualifiers="" type="drawable"/><file name="tavernalogo" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/drawable/tavernalogo.png" qualifiers="" type="drawable"/><file name="ic_userprofile" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/drawable/ic_userprofile.png" qualifiers
="" type="drawable"/><file name="drawer_shadow" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/drawable-hdpi/drawer_shadow.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="ic_drawer" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/drawable-hdpi/ic_drawer.png" qualifiers="hdpi-v4" type="drawable"/><file name="drawer_shadow" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/drawable-xhdpi/drawer_shadow.9.png" qualifiers="xhdpi-v4" type="drawable"/><file name="ic_drawer" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/drawable-xhdpi/ic_drawer.png" qualifiers="xhdpi-v4" type="drawable"/><file name="menu_workflow_detail" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/menu/menu_workflow_detail.xml" qualifiers="" type="menu"/><file name="global" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/menu/global.xml" qualifiers="" type="menu"/><file name="dashboard_main" path="/root/Desktop/AndroidLab
/TavernaMobile2/app/src/main/res/menu/dashboard_main.xml" qualifiers="" type="menu"/><file path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/values-large/refs.xml" qualifiers="large-v4"><item name="fragment_item" type="layout">@layout/fragment_item_grid</item></file><file path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/values-large/strings.xml" qualifiers="large-v4"><string name="completebrand">Powered By Apache Taverna</string><string name="play_workflow">Run</string></file><file name="ic_markworkflow_selected" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/mipmap-xhdpi/ic_markworkflow_selected.png" qualifiers="xhdpi-v4" type="mipmap"/><file name="ic_workflows" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/mipmap-xhdpi/ic_workflows.png" qualifiers="xhdpi-v4" type="mipmap"/><file name="ic_usage" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/mipmap-xhdpi/ic_usage.png" qualifiers="xhdpi-v4" type="mipmap"/><f
ile name="ic_viewworkflow" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/mipmap-xhdpi/ic_viewworkflow.png" qualifiers="xhdpi-v4" type="mipmap"/><file name="icuserprofiles" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/mipmap-xhdpi/icuserprofiles.png" qualifiers="xhdpi-v4" type="mipmap"/><file name="ic_poweredby" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/mipmap-xhdpi/ic_poweredby.png" qualifiers="xhdpi-v4" type="mipmap"/><file name="ic_logout" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/mipmap-xhdpi/ic_logout.png" qualifiers="xhdpi-v4" type="mipmap"/><file name="ic_launcher" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/mipmap-xhdpi/ic_launcher.png" qualifiers="xhdpi-v4" type="mipmap"/><file name="ic_user" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/mipmap-xhdpi/ic_user.png" qualifiers="xhdpi-v4" type="mipmap"/><file name="ic_quit" path="/root/Desktop/AndroidLab/TavernaMobile
2/app/src/main/res/mipmap-xhdpi/ic_quit.png" qualifiers="xhdpi-v4" type="mipmap"/><file name="ic_about" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/mipmap-xhdpi/ic_about.png" qualifiers="xhdpi-v4" type="mipmap"/><file name="ic_markworkflow_unselected" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/mipmap-xhdpi/ic_markworkflow_unselected.png" qualifiers="xhdpi-v4" type="mipmap"/><file name="ic_openwk" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/mipmap-xhdpi/ic_openwk.png" qualifiers="xhdpi-v4" type="mipmap"/><file name="ic_markworkflow_selected" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/drawable-mdpi/ic_markworkflow_selected.png" qualifiers="mdpi-v4" type="drawable"/><file name="ic_viewworkflow" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/drawable-mdpi/ic_viewworkflow.png" qualifiers="mdpi-v4" type="drawable"/><file name="ic_downloadworkflow" path="/root/Desktop/AndroidLab/TavernaMobile2/app
/src/main/res/drawable-mdpi/ic_downloadworkflow.png" qualifiers="mdpi-v4" type="drawable"/><file name="drawer_shadow" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/drawable-mdpi/drawer_shadow.9.png" qualifiers="mdpi-v4" type="drawable"/><file name="ic_drawer" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/drawable-mdpi/ic_drawer.png" qualifiers="mdpi-v4" type="drawable"/><file name="ic_markworkflow_unselected" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/drawable-mdpi/ic_markworkflow_unselected.png" qualifiers="mdpi-v4" type="drawable"/><file name="ic_markworkflow_selected" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/mipmap-xxxhdpi/ic_markworkflow_selected.png" qualifiers="xxxhdpi-v4" type="mipmap"/><file name="ic_workflows" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/mipmap-xxxhdpi/ic_workflows.png" qualifiers="xxxhdpi-v4" type="mipmap"/><file name="ic_usage" path="/root/Desktop/AndroidLab/Tave
rnaMobile2/app/src/main/res/mipmap-xxxhdpi/ic_usage.png" qualifiers="xxxhdpi-v4" type="mipmap"/><file name="ic_viewworkflow" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/mipmap-xxxhdpi/ic_viewworkflow.png" qualifiers="xxxhdpi-v4" type="mipmap"/><file name="icuserprofiles" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/mipmap-xxxhdpi/icuserprofiles.png" qualifiers="xxxhdpi-v4" type="mipmap"/><file name="ic_poweredby" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/mipmap-xxxhdpi/ic_poweredby.png" qualifiers="xxxhdpi-v4" type="mipmap"/><file name="ic_logout" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/mipmap-xxxhdpi/ic_logout.png" qualifiers="xxxhdpi-v4" type="mipmap"/><file name="ic_launcher" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png" qualifiers="xxxhdpi-v4" type="mipmap"/><file name="ic_user" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/mipmap-xxx
hdpi/ic_user.png" qualifiers="xxxhdpi-v4" type="mipmap"/><file name="ic_quit" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/mipmap-xxxhdpi/ic_quit.png" qualifiers="xxxhdpi-v4" type="mipmap"/><file name="ic_about" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/mipmap-xxxhdpi/ic_about.png" qualifiers="xxxhdpi-v4" type="mipmap"/><file name="ic_markworkflow_unselected" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/mipmap-xxxhdpi/ic_markworkflow_unselected.png" qualifiers="xxxhdpi-v4" type="mipmap"/><file name="ic_openwk" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/mipmap-xxxhdpi/ic_openwk.png" qualifiers="xxxhdpi-v4" type="mipmap"/><file name="workflow_run_item" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/layout/workflow_run_item.xml" qualifiers="" type="layout"/></source><source path="/root/Desktop/AndroidLab/TavernaMobile2/app/build/generated/res/rs/debug"/><source path="/root/Desktop/AndroidLab/Ta
vernaMobile2/app/build/generated/res/generated/debug"/></dataSet><dataSet config="debug"><source path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/debug/res"/></dataSet><mergedItems><configuration qualifiers=""><declare-styleable name="SwitchCompatTextAppearance"><attr name="android:textSize"/><attr name="android:textColor"/><attr name="textAllCaps"/></declare-styleable><declare-styleable name="Spinner"><attr format="reference" name="prompt"/><attr format="enum" name="spinnerMode"><enum name="dialog" value="0"/><enum name="dropdown" value="1"/></attr><attr name="android:dropDownSelector"/><attr name="android:popupBackground"/><attr name="android:dropDownVerticalOffset"/><attr name="android:dropDownHorizontalOffset"/><attr name="android:dropDownWidth"/><attr format="reference" name="popupPromptView"/><attr name="android:gravity"/><attr format="boolean" name="disableChildrenWhenDisabled"/><attr name="android:background"/></declare-styleable><declare-styleable name="PopupWindow"><a
ttr format="boolean" name="overlapAnchor"/><attr name="android:popupBackground"/></declare-styleable><declare-styleable name="DrawerArrowToggle"><attr format="color" name="color"/><attr format="boolean" name="spinBars"/><attr format="dimension" name="drawableSize"/><attr format="dimension" name="gapBetweenBars"/><attr format="dimension" name="topBottomBarArrowSize"/><attr format="dimension" name="middleBarArrowSize"/><attr format="dimension" name="barSize"/><attr format="dimension" name="thickness"/></declare-styleable><declare-styleable name="ActionBarLayout"><attr name="android:layout_gravity"/></declare-styleable><declare-styleable name="ActivityChooserView"><attr format="string" name="initialActivityCount"/><attr format="reference" name="expandActivityOverflowButtonDrawable"/></declare-styleable><declare-styleable name="ViewStubCompat"><attr name="android:layout"/><attr name="android:inflatedId"/><attr name="android:id"/></declare-styleable><declare-styleable name="ListPopupWind
ow"><attr name="android:dropDownVerticalOffset"/><attr name="android:dropDownHorizontalOffset"/></declare-styleable><declare-styleable name="CompatTextView"><attr format="reference|boolean" name="textAllCaps"/></declare-styleable><declare-styleable name="MenuView"><attr name="android:itemTextAppearance"/><attr name="android:horizontalDivider"/><attr name="android:verticalDivider"/><attr name="android:headerBackground"/><attr name="android:itemBackground"/><attr name="android:windowAnimationStyle"/><attr name="android:itemIconDisabledAlpha"/><attr format="boolean" name="preserveIconSpacing"/></declare-styleable><declare-styleable name="ActionBar"><attr name="navigationMode"><enum name="normal" value="0"/><enum name="listMode" value="1"/><enum name="tabMode" value="2"/></attr><attr name="displayOptions"><flag name="none" value="0"/><flag name="useLogo" value="0x1"/><flag name="showHome" value="0x2"/><flag name="homeAsUp" value="0x4"/><flag name="showTitle" value="0x8"/><flag name="sho
wCustom" value="0x10"/><flag name="disableHome" value="0x20"/></attr><attr name="title"/><attr format="string" name="subtitle"/><attr format="reference" name="titleTextStyle"/><attr format="reference" name="subtitleTextStyle"/><attr format="reference" name="icon"/><attr format="reference" name="logo"/><attr format="reference" name="divider"/><attr format="reference" name="background"/><attr format="reference|color" name="backgroundStacked"/><attr format="reference|color" name="backgroundSplit"/><attr format="reference" name="customNavigationLayout"/><attr name="height"/><attr format="reference" name="homeLayout"/><attr format="reference" name="progressBarStyle"/><attr format="reference" name="indeterminateProgressStyle"/><attr format="dimension" name="progressBarPadding"/><attr name="homeAsUpIndicator"/><attr format="dimension" name="itemPadding"/><attr format="boolean" name="hideOnContentScroll"/><attr format="dimension" name="contentInsetStart"/><attr format="dimension" name="cont
entInsetEnd"/><attr format="dimension" name="contentInsetLeft"/><attr format="dimension" name="contentInsetRight"/><attr format="dimension" name="elevation"/><attr format="reference" name="popupTheme"/></declare-styleable><declare-styleable name="ActionMenuItemView"><attr name="android:minWidth"/></declare-styleable><declare-styleable name="MenuGroup"><attr name="android:id"/><attr name="android:menuCategory"/><attr name="android:orderInCategory"/><attr name="android:checkableBehavior"/><attr name="android:visible"/><attr name="android:enabled"/></declare-styleable><declare-styleable name="Toolbar"><attr format="reference" name="titleTextAppearance"/><attr format="reference" name="subtitleTextAppearance"/><attr name="title"/><attr name="subtitle"/><attr name="android:gravity"/><attr format="dimension" name="titleMargins"/><attr format="dimension" name="titleMarginStart"/><attr format="dimension" name="titleMarginEnd"/><attr format="dimension" name="titleMarginTop"/><attr format="dim
ension" name="titleMarginBottom"/><attr name="contentInsetStart"/><attr name="contentInsetEnd"/><attr name="contentInsetLeft"/><attr name="contentInsetRight"/><attr format="dimension" name="maxButtonHeight"/><attr format="reference" name="theme"/><attr format="reference" name="collapseIcon"/><attr format="string" name="collapseContentDescription"/><attr name="popupTheme"/><attr format="reference" name="navigationIcon"/><attr format="string" name="navigationContentDescription"/><attr name="android:minHeight"/></declare-styleable><declare-styleable name="LinearLayoutCompat_Layout"><attr name="android:layout_width"/><attr name="android:layout_height"/><attr name="android:layout_weight"/><attr name="android:layout_gravity"/></declare-styleable><declare-styleable name="CardView"><attr format="color" name="cardBackgroundColor"/><attr format="dimension" name="cardCornerRadius"/><attr format="dimension" name="cardElevation"/><attr format="dimension" name="cardMaxElevation"/><attr format="bo
olean" name="cardUseCompatPadding"/><attr format="boolean" name="cardPreventCornerOverlap"/><attr format="dimension" name="contentPadding"/><attr format="dimension" name="contentPaddingLeft"/><attr format="dimension" name="contentPaddingRight"/><attr format="dimension" name="contentPaddingTop"/><attr format="dimension" name="contentPaddingBottom"/></declare-styleable><declare-styleable name="MenuItem"><attr name="android:id"/><attr name="android:menuCategory"/><attr name="android:orderInCategory"/><attr name="android:title"/><attr name="android:titleCondensed"/><attr name="android:icon"/><attr name="android:alphabeticShortcut"/><attr name="android:numericShortcut"/><attr name="android:checkable"/><attr name="android:checked"/><attr name="android:visible"/><attr name="android:enabled"/><attr name="android:onClick"/><attr name="showAsAction"><flag name="never" value="0"/><flag name="ifRoom" value="1"/><flag name="always" value="2"/><flag name="withText" value="4"/><flag name="collapse
ActionView" value="8"/></attr><attr format="reference" name="actionLayout"/><attr format="string" name="actionViewClass"/><attr format="string" name="actionProviderClass"/></declare-styleable><declare-styleable name="View"><attr format="dimension" name="paddingStart"/><attr format="dimension" name="paddingEnd"/><attr name="android:focusable"/></declare-styleable><declare-styleable name="PopupWindowBackgroundState"><attr format="boolean" name="state_above_anchor"/></declare-styleable><declare-styleable name="LinearLayoutCompat"><attr name="android:orientation"/><attr name="android:gravity"/><attr name="android:baselineAligned"/><attr name="android:baselineAlignedChildIndex"/><attr name="android:weightSum"/><attr format="boolean" name="measureWithLargestChild"/><attr name="divider"/><attr name="showDividers"><flag name="none" value="0"/><flag name="beginning" value="1"/><flag name="middle" value="2"/><flag name="end" value="4"/></attr><attr format="dimension" name="dividerPadding"/></
declare-styleable><declare-styleable name="SearchView"><attr format="reference" name="layout"/><attr format="boolean" name="iconifiedByDefault"/><attr name="android:maxWidth"/><attr format="string" name="queryHint"/><attr name="android:imeOptions"/><attr name="android:inputType"/><attr format="reference" name="closeIcon"/><attr format="reference" name="goIcon"/><attr format="reference" name="searchIcon"/><attr format="reference" name="voiceIcon"/><attr format="reference" name="commitIcon"/><attr format="reference" name="suggestionRowLayout"/><attr format="reference" name="queryBackground"/><attr format="reference" name="submitBackground"/><attr name="android:focusable"/></declare-styleable><declare-styleable name="ActionMode"><attr name="titleTextStyle"/><attr name="subtitleTextStyle"/><attr name="background"/><attr name="backgroundSplit"/><attr name="height"/><attr format="reference" name="closeItemLayout"/></declare-styleable><declare-styleable name="Theme"><attr format="boolean"
name="windowActionBar"/><attr format="boolean" name="windowActionBarOverlay"/><attr format="boolean" name="windowActionModeOverlay"/><attr format="dimension|fraction" name="windowFixedWidthMajor"/><attr format="dimension|fraction" name="windowFixedHeightMinor"/><attr format="dimension|fraction" name="windowFixedWidthMinor"/><attr format="dimension|fraction" name="windowFixedHeightMajor"/><attr name="android:windowIsFloating"/><attr name="android:windowAnimationStyle"/><attr format="reference" name="actionBarTabStyle"/><attr format="reference" name="actionBarTabBarStyle"/><attr format="reference" name="actionBarTabTextStyle"/><attr format="reference" name="actionOverflowButtonStyle"/><attr format="reference" name="actionOverflowMenuStyle"/><attr format="reference" name="actionBarPopupTheme"/><attr format="reference" name="actionBarStyle"/><attr format="reference" name="actionBarSplitStyle"/><attr format="reference" name="actionBarTheme"/><attr format="reference" name="actionBarWidget
Theme"/><attr format="dimension" name="actionBarSize"><enum name="wrap_content" value="0"/></attr><attr format="reference" name="actionBarDivider"/><attr format="reference" name="actionBarItemBackground"/><attr format="reference" name="actionMenuTextAppearance"/><attr format="color|reference" name="actionMenuTextColor"/><attr format="reference" name="actionModeStyle"/><attr format="reference" name="actionModeCloseButtonStyle"/><attr format="reference" name="actionModeBackground"/><attr format="reference" name="actionModeSplitBackground"/><attr format="reference" name="actionModeCloseDrawable"/><attr format="reference" name="actionModeCutDrawable"/><attr format="reference" name="actionModeCopyDrawable"/><attr format="reference" name="actionModePasteDrawable"/><attr format="reference" name="actionModeSelectAllDrawable"/><attr format="reference" name="actionModeShareDrawable"/><attr format="reference" name="actionModeFindDrawable"/><attr format="reference" name="actionModeWebSearchDraw
able"/><attr format="reference" name="actionModePopupWindowStyle"/><attr format="reference" name="textAppearanceLargePopupMenu"/><attr format="reference" name="textAppearanceSmallPopupMenu"/><attr format="reference" name="actionDropDownStyle"/><attr format="dimension" name="dropdownListPreferredItemHeight"/><attr format="reference" name="spinnerStyle"/><attr format="reference" name="spinnerDropDownItemStyle"/><attr format="reference" name="homeAsUpIndicator"/><attr format="reference" name="actionButtonStyle"/><attr format="reference" name="buttonBarStyle"/><attr format="reference" name="buttonBarButtonStyle"/><attr format="reference" name="selectableItemBackground"/><attr format="reference" name="selectableItemBackgroundBorderless"/><attr format="reference" name="dividerVertical"/><attr format="reference" name="dividerHorizontal"/><attr format="reference" name="activityChooserViewStyle"/><attr format="reference" name="toolbarStyle"/><attr format="reference" name="toolbarNavigationBu
ttonStyle"/><attr format="reference" name="popupMenuStyle"/><attr format="reference" name="popupWindowStyle"/><attr format="reference|color" name="editTextColor"/><attr format="reference" name="editTextBackground"/><attr format="reference" name="switchStyle"/><attr format="reference" name="textAppearanceSearchResultTitle"/><attr format="reference" name="textAppearanceSearchResultSubtitle"/><attr format="reference|color" name="textColorSearchUrl"/><attr format="reference" name="searchViewStyle"/><attr format="dimension" name="listPreferredItemHeight"/><attr format="dimension" name="listPreferredItemHeightSmall"/><attr format="dimension" name="listPreferredItemHeightLarge"/><attr format="dimension" name="listPreferredItemPaddingLeft"/><attr format="dimension" name="listPreferredItemPaddingRight"/><attr format="reference" name="dropDownListViewStyle"/><attr format="reference" name="listPopupWindowStyle"/><attr format="reference" name="textAppearanceListItem"/><attr format="reference" n
ame="textAppearanceListItemSmall"/><attr format="reference" name="panelBackground"/><attr format="dimension" name="panelMenuListWidth"/><attr format="reference" name="panelMenuListTheme"/><attr format="reference" name="listChoiceBackgroundIndicator"/><attr format="color" name="colorPrimary"/><attr format="color" name="colorPrimaryDark"/><attr format="color" name="colorAccent"/><attr format="color" name="colorControlNormal"/><attr format="color" name="colorControlActivated"/><attr format="color" name="colorControlHighlight"/><attr format="color" name="colorButtonNormal"/><attr format="color" name="colorSwitchThumbNormal"/></declare-styleable><declare-styleable name="ActionMenuView"/><declare-styleable name="SwitchCompat"><attr name="android:thumb"/><attr format="reference" name="track"/><attr name="android:textOn"/><attr name="android:textOff"/><attr format="dimension" name="thumbTextPadding"/><attr format="reference" name="switchTextAppearance"/><attr format="dimension" name="switch
MinWidth"/><attr format="dimension" name="switchPadding"/><attr format="boolean" name="splitTrack"/><attr format="boolean" name="showText"/></declare-styleable></configuration></mergedItems></merger>
\ No newline at end of file
+ </string-array><string name="action_settings">Settings</string><string name="app_name">TavernaMobile</string><string name="brand">Powered By</string><string name="workflow_download">Download</string><string name="modified">Modified :</string><string name="workflow_empty"> No <b>Workflows</b> Available. Check your Connection to the Internet</string><string name="downloaderror">Unable to start Download. Check your internet connectivity</string><string name="loginusername">Email or Username</string><string name="title_exit">Logout</string></file><file name="ic_markworkflow_selected" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/mipmap-mdpi/ic_markworkflow_selected.png" qualifiers="mdpi-v4" type="mipmap"/><file name="ic_workflows" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/mipmap-mdpi/ic_workflows.png" qualifiers="mdpi-v4" type="mipmap"/><file name="ic_usage" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/mipmap-mdpi/ic_usage.png"
qualifiers="mdpi-v4" type="mipmap"/><file name="ic_viewworkflow" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/mipmap-mdpi/ic_viewworkflow.png" qualifiers="mdpi-v4" type="mipmap"/><file name="icuserprofiles" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/mipmap-mdpi/icuserprofiles.png" qualifiers="mdpi-v4" type="mipmap"/><file name="ic_poweredby" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/mipmap-mdpi/ic_poweredby.png" qualifiers="mdpi-v4" type="mipmap"/><file name="ic_logout" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/mipmap-mdpi/ic_logout.png" qualifiers="mdpi-v4" type="mipmap"/><file name="ic_launcher" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/mipmap-mdpi/ic_launcher.png" qualifiers="mdpi-v4" type="mipmap"/><file name="ic_user" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/mipmap-mdpi/ic_user.png" qualifiers="mdpi-v4" type="mipmap"/><file name="ic_quit" path="/root/Deskt
op/AndroidLab/TavernaMobile2/app/src/main/res/mipmap-mdpi/ic_quit.png" qualifiers="mdpi-v4" type="mipmap"/><file name="ic_about" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/mipmap-mdpi/ic_about.png" qualifiers="mdpi-v4" type="mipmap"/><file name="ic_markworkflow_unselected" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/mipmap-mdpi/ic_markworkflow_unselected.png" qualifiers="mdpi-v4" type="mipmap"/><file name="ic_openwk" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/mipmap-mdpi/ic_openwk.png" qualifiers="mdpi-v4" type="mipmap"/><file name="searchable" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/xml/searchable.xml" qualifiers="" type="xml"/><file path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/values-sw600dp/refs.xml" qualifiers="sw600dp-v13"><item name="fragment_item" type="layout">@layout/fragment_item_grid</item></file><file path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/values-sw
600dp/strings.xml" qualifiers="sw600dp-v13"><string name="completebrand">Powered By Apache Taverna</string></file><file name="workflow_layout" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/layout/workflow_layout.xml" qualifiers="" type="layout"/><file name="activity_flash_screen" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/layout/activity_flash_screen.xml" qualifiers="" type="layout"/><file name="fragment_login" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/layout/fragment_login.xml" qualifiers="" type="layout"/><file name="fragment_item_list" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/layout/fragment_item_list.xml" qualifiers="" type="layout"/><file name="fragment_workflow_detail" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/layout/fragment_workflow_detail.xml" qualifiers="" type="layout"/><file name="fragment_item_grid" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/layout/fr
agment_item_grid.xml" qualifiers="" type="layout"/><file name="fragment_workflow_run_history" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/layout/fragment_workflow_run_history.xml" qualifiers="" type="layout"/><file name="fragment_navigation_drawer" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/layout/fragment_navigation_drawer.xml" qualifiers="" type="layout"/><file name="menu_item_layout" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/layout/menu_item_layout.xml" qualifiers="" type="layout"/><file name="activity_login" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/layout/activity_login.xml" qualifiers="" type="layout"/><file name="activity_dashboard_main" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/layout/activity_dashboard_main.xml" qualifiers="" type="layout"/><file name="activity_workflow_detail" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/layout/activity_workflow_detail.xm
l" qualifiers="" type="layout"/><file name="workflow_item_layout" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/layout/workflow_item_layout.xml" qualifiers="" type="layout"/><file name="fragment_workflow_about" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/layout/fragment_workflow_about.xml" qualifiers="" type="layout"/><file name="fragment_workflow_licence" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/layout/fragment_workflow_licence.xml" qualifiers="" type="layout"/><file name="fragment_dashboard_main" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/layout/fragment_dashboard_main.xml" qualifiers="" type="layout"/><file name="favorite_item_layout" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/layout/favorite_item_layout.xml" qualifiers="" type="layout"/><file name="fragment_login" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/layout-xlarge/fragment_login.xml" qualifiers="xlarge-v4"
type="layout"/><file path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/values-w820dp/dimens.xml" qualifiers="w820dp-v13"><dimen name="activity_horizontal_margin">64dp</dimen></file><file path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/values-w820dp/strings.xml" qualifiers="w820dp-v13"><string name="completebrand">Powered By Apache Taverna</string></file><file name="activity_dashboard_main" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/layout-land/activity_dashboard_main.xml" qualifiers="land" type="layout"/><file name="drawer_shadow" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/drawable-xxhdpi/drawer_shadow.9.png" qualifiers="xxhdpi-v4" type="drawable"/><file name="ic_drawer" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/drawable-xxhdpi/ic_drawer.png" qualifiers="xxhdpi-v4" type="drawable"/><file name="ic_markworkflow_selected" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/mipmap-hdpi/ic
_markworkflow_selected.png" qualifiers="hdpi-v4" type="mipmap"/><file name="ic_workflows" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/mipmap-hdpi/ic_workflows.png" qualifiers="hdpi-v4" type="mipmap"/><file name="ic_usage" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/mipmap-hdpi/ic_usage.png" qualifiers="hdpi-v4" type="mipmap"/><file name="ic_viewworkflow" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/mipmap-hdpi/ic_viewworkflow.png" qualifiers="hdpi-v4" type="mipmap"/><file name="icuserprofiles" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/mipmap-hdpi/icuserprofiles.png" qualifiers="hdpi-v4" type="mipmap"/><file name="ic_poweredby" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/mipmap-hdpi/ic_poweredby.png" qualifiers="hdpi-v4" type="mipmap"/><file name="ic_logout" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/mipmap-hdpi/ic_logout.png" qualifiers="hdpi-v4" type="mipmap"/><file n
ame="ic_launcher" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/mipmap-hdpi/ic_launcher.png" qualifiers="hdpi-v4" type="mipmap"/><file name="ic_user" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/mipmap-hdpi/ic_user.png" qualifiers="hdpi-v4" type="mipmap"/><file name="ic_quit" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/mipmap-hdpi/ic_quit.png" qualifiers="hdpi-v4" type="mipmap"/><file name="ic_about" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/mipmap-hdpi/ic_about.png" qualifiers="hdpi-v4" type="mipmap"/><file name="ic_markworkflow_unselected" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/mipmap-hdpi/ic_markworkflow_unselected.png" qualifiers="hdpi-v4" type="mipmap"/><file name="ic_openwk" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/mipmap-hdpi/ic_openwk.png" qualifiers="hdpi-v4" type="mipmap"/><file name="ic_markworkflow_selected" path="/root/Desktop/AndroidLab/TavernaMobile
2/app/src/main/res/mipmap-xxhdpi/ic_markworkflow_selected.png" qualifiers="xxhdpi-v4" type="mipmap"/><file name="ic_workflows" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/mipmap-xxhdpi/ic_workflows.png" qualifiers="xxhdpi-v4" type="mipmap"/><file name="ic_usage" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/mipmap-xxhdpi/ic_usage.png" qualifiers="xxhdpi-v4" type="mipmap"/><file name="ic_viewworkflow" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/mipmap-xxhdpi/ic_viewworkflow.png" qualifiers="xxhdpi-v4" type="mipmap"/><file name="icuserprofiles" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/mipmap-xxhdpi/icuserprofiles.png" qualifiers="xxhdpi-v4" type="mipmap"/><file name="ic_poweredby" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/mipmap-xxhdpi/ic_poweredby.png" qualifiers="xxhdpi-v4" type="mipmap"/><file name="ic_logout" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/mipmap-xxhdpi
/ic_logout.png" qualifiers="xxhdpi-v4" type="mipmap"/><file name="ic_launcher" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/mipmap-xxhdpi/ic_launcher.png" qualifiers="xxhdpi-v4" type="mipmap"/><file name="ic_user" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/mipmap-xxhdpi/ic_user.png" qualifiers="xxhdpi-v4" type="mipmap"/><file name="ic_quit" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/mipmap-xxhdpi/ic_quit.png" qualifiers="xxhdpi-v4" type="mipmap"/><file name="ic_about" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/mipmap-xxhdpi/ic_about.png" qualifiers="xxhdpi-v4" type="mipmap"/><file name="ic_markworkflow_unselected" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/mipmap-xxhdpi/ic_markworkflow_unselected.png" qualifiers="xxhdpi-v4" type="mipmap"/><file name="ic_openwk" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/mipmap-xxhdpi/ic_openwk.png" qualifiers="xxhdpi-v4" type="mipmap
"/><file name="sliding_header" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/drawable/sliding_header.png" qualifiers="" type="drawable"/><file name="gear_icon" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/drawable/gear_icon.png" qualifiers="" type="drawable"/><file name="downloadwk" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/drawable/downloadwk.png" qualifiers="" type="drawable"/><file name="round_shape" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/drawable/round_shape.xml" qualifiers="" type="drawable"/><file name="download" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/drawable/download.jpg" qualifiers="" type="drawable"/><file name="tavernalogo" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/drawable/tavernalogo.png" qualifiers="" type="drawable"/><file name="ic_userprofile" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/drawable/ic_userprofile.png" qualifiers
="" type="drawable"/><file name="drawer_shadow" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/drawable-hdpi/drawer_shadow.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="ic_drawer" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/drawable-hdpi/ic_drawer.png" qualifiers="hdpi-v4" type="drawable"/><file name="drawer_shadow" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/drawable-xhdpi/drawer_shadow.9.png" qualifiers="xhdpi-v4" type="drawable"/><file name="ic_drawer" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/drawable-xhdpi/ic_drawer.png" qualifiers="xhdpi-v4" type="drawable"/><file name="menu_workflow_detail" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/menu/menu_workflow_detail.xml" qualifiers="" type="menu"/><file name="global" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/menu/global.xml" qualifiers="" type="menu"/><file name="dashboard_main" path="/root/Desktop/AndroidLab
/TavernaMobile2/app/src/main/res/menu/dashboard_main.xml" qualifiers="" type="menu"/><file path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/values-large/refs.xml" qualifiers="large-v4"><item name="fragment_item" type="layout">@layout/fragment_item_grid</item></file><file path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/values-large/strings.xml" qualifiers="large-v4"><string name="completebrand">Powered By Apache Taverna</string><string name="play_workflow">Run</string></file><file name="ic_markworkflow_selected" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/mipmap-xhdpi/ic_markworkflow_selected.png" qualifiers="xhdpi-v4" type="mipmap"/><file name="ic_workflows" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/mipmap-xhdpi/ic_workflows.png" qualifiers="xhdpi-v4" type="mipmap"/><file name="ic_usage" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/mipmap-xhdpi/ic_usage.png" qualifiers="xhdpi-v4" type="mipmap"/><f
ile name="ic_viewworkflow" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/mipmap-xhdpi/ic_viewworkflow.png" qualifiers="xhdpi-v4" type="mipmap"/><file name="icuserprofiles" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/mipmap-xhdpi/icuserprofiles.png" qualifiers="xhdpi-v4" type="mipmap"/><file name="ic_poweredby" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/mipmap-xhdpi/ic_poweredby.png" qualifiers="xhdpi-v4" type="mipmap"/><file name="ic_logout" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/mipmap-xhdpi/ic_logout.png" qualifiers="xhdpi-v4" type="mipmap"/><file name="ic_launcher" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/mipmap-xhdpi/ic_launcher.png" qualifiers="xhdpi-v4" type="mipmap"/><file name="ic_user" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/mipmap-xhdpi/ic_user.png" qualifiers="xhdpi-v4" type="mipmap"/><file name="ic_quit" path="/root/Desktop/AndroidLab/TavernaMobile
2/app/src/main/res/mipmap-xhdpi/ic_quit.png" qualifiers="xhdpi-v4" type="mipmap"/><file name="ic_about" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/mipmap-xhdpi/ic_about.png" qualifiers="xhdpi-v4" type="mipmap"/><file name="ic_markworkflow_unselected" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/mipmap-xhdpi/ic_markworkflow_unselected.png" qualifiers="xhdpi-v4" type="mipmap"/><file name="ic_openwk" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/mipmap-xhdpi/ic_openwk.png" qualifiers="xhdpi-v4" type="mipmap"/><file name="ic_markworkflow_selected" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/drawable-mdpi/ic_markworkflow_selected.png" qualifiers="mdpi-v4" type="drawable"/><file name="ic_viewworkflow" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/drawable-mdpi/ic_viewworkflow.png" qualifiers="mdpi-v4" type="drawable"/><file name="ic_downloadworkflow" path="/root/Desktop/AndroidLab/TavernaMobile2/app
/src/main/res/drawable-mdpi/ic_downloadworkflow.png" qualifiers="mdpi-v4" type="drawable"/><file name="drawer_shadow" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/drawable-mdpi/drawer_shadow.9.png" qualifiers="mdpi-v4" type="drawable"/><file name="ic_drawer" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/drawable-mdpi/ic_drawer.png" qualifiers="mdpi-v4" type="drawable"/><file name="ic_markworkflow_unselected" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/drawable-mdpi/ic_markworkflow_unselected.png" qualifiers="mdpi-v4" type="drawable"/><file name="ic_markworkflow_selected" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/mipmap-xxxhdpi/ic_markworkflow_selected.png" qualifiers="xxxhdpi-v4" type="mipmap"/><file name="ic_workflows" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/mipmap-xxxhdpi/ic_workflows.png" qualifiers="xxxhdpi-v4" type="mipmap"/><file name="ic_usage" path="/root/Desktop/AndroidLab/Tave
rnaMobile2/app/src/main/res/mipmap-xxxhdpi/ic_usage.png" qualifiers="xxxhdpi-v4" type="mipmap"/><file name="ic_viewworkflow" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/mipmap-xxxhdpi/ic_viewworkflow.png" qualifiers="xxxhdpi-v4" type="mipmap"/><file name="icuserprofiles" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/mipmap-xxxhdpi/icuserprofiles.png" qualifiers="xxxhdpi-v4" type="mipmap"/><file name="ic_poweredby" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/mipmap-xxxhdpi/ic_poweredby.png" qualifiers="xxxhdpi-v4" type="mipmap"/><file name="ic_logout" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/mipmap-xxxhdpi/ic_logout.png" qualifiers="xxxhdpi-v4" type="mipmap"/><file name="ic_launcher" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png" qualifiers="xxxhdpi-v4" type="mipmap"/><file name="ic_user" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/mipmap-xxx
hdpi/ic_user.png" qualifiers="xxxhdpi-v4" type="mipmap"/><file name="ic_quit" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/mipmap-xxxhdpi/ic_quit.png" qualifiers="xxxhdpi-v4" type="mipmap"/><file name="ic_about" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/mipmap-xxxhdpi/ic_about.png" qualifiers="xxxhdpi-v4" type="mipmap"/><file name="ic_markworkflow_unselected" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/mipmap-xxxhdpi/ic_markworkflow_unselected.png" qualifiers="xxxhdpi-v4" type="mipmap"/><file name="ic_openwk" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/mipmap-xxxhdpi/ic_openwk.png" qualifiers="xxxhdpi-v4" type="mipmap"/><file name="workflow_run_item" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/layout/workflow_run_item.xml" qualifiers="" type="layout"/><file name="pref_headers" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/xml/pref_headers.xml" qualifiers="" type="xml"/><f
ile name="pref_general" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/xml/pref_general.xml" qualifiers="" type="xml"/><file path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/values/strings_activity_settings.xml" qualifiers=""><string name="pref_player_title">Configure Taverna player portal</string><string name="pref_login_description">Decide whether or not to be automatically logged-in when next the app starts</string><string name="pref_remainLogged_in">Remain Logged-in</string><string name="pref_player_default"> http://heater.cs.man.ac.uk:3000/</string><string name="pref_header_general">General</string><string name="pref_server_title">Configure Taverna Server </string><string name="pref_server_default"> http://heater.cs.man.ac.uk:8090/taverna-2.5.4/</string><string name="pref_server_des">Configure a different Taverna Server for the app</string><string name="title_activity_settings">Settings</string><string name="pref_player_des">Configure a different p
layer URL for the app to use. End with the mount point(/)</string></file><file name="ic_dashboard_home" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/mipmap-xxxhdpi/ic_dashboard_home.png" qualifiers="xxxhdpi-v4" type="mipmap"/><file name="ic_dashboard_home" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/mipmap-mdpi/ic_dashboard_home.png" qualifiers="mdpi-v4" type="mipmap"/><file name="ic_dashboard_home" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/mipmap-xxhdpi/ic_dashboard_home.png" qualifiers="xxhdpi-v4" type="mipmap"/><file name="ic_dashboard_home" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/mipmap-hdpi/ic_dashboard_home.png" qualifiers="hdpi-v4" type="mipmap"/><file name="ic_dashboard_home" path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/mipmap-xhdpi/ic_dashboard_home.png" qualifiers="xhdpi-v4" type="mipmap"/></source><source path="/root/Desktop/AndroidLab/TavernaMobile2/app/build/generated/res/
rs/debug"/><source path="/root/Desktop/AndroidLab/TavernaMobile2/app/build/generated/res/generated/debug"/></dataSet><dataSet config="debug"><source path="/root/Desktop/AndroidLab/TavernaMobile2/app/src/debug/res"/></dataSet><mergedItems><configuration qualifiers=""><declare-styleable name="SwitchCompatTextAppearance"><attr name="android:textSize"/><attr name="android:textColor"/><attr name="textAllCaps"/></declare-styleable><declare-styleable name="Spinner"><attr format="reference" name="prompt"/><attr format="enum" name="spinnerMode"><enum name="dialog" value="0"/><enum name="dropdown" value="1"/></attr><attr name="android:dropDownSelector"/><attr name="android:popupBackground"/><attr name="android:dropDownVerticalOffset"/><attr name="android:dropDownHorizontalOffset"/><attr name="android:dropDownWidth"/><attr format="reference" name="popupPromptView"/><attr name="android:gravity"/><attr format="boolean" name="disableChildrenWhenDisabled"/><attr name="android:background"/></declar
e-styleable><declare-styleable name="PopupWindow"><attr format="boolean" name="overlapAnchor"/><attr name="android:popupBackground"/></declare-styleable><declare-styleable name="DrawerArrowToggle"><attr format="color" name="color"/><attr format="boolean" name="spinBars"/><attr format="dimension" name="drawableSize"/><attr format="dimension" name="gapBetweenBars"/><attr format="dimension" name="topBottomBarArrowSize"/><attr format="dimension" name="middleBarArrowSize"/><attr format="dimension" name="barSize"/><attr format="dimension" name="thickness"/></declare-styleable><declare-styleable name="ActionBarLayout"><attr name="android:layout_gravity"/></declare-styleable><declare-styleable name="ActivityChooserView"><attr format="string" name="initialActivityCount"/><attr format="reference" name="expandActivityOverflowButtonDrawable"/></declare-styleable><declare-styleable name="ViewStubCompat"><attr name="android:layout"/><attr name="android:inflatedId"/><attr name="android:id"/></decl
are-styleable><declare-styleable name="ListPopupWindow"><attr name="android:dropDownVerticalOffset"/><attr name="android:dropDownHorizontalOffset"/></declare-styleable><declare-styleable name="CompatTextView"><attr format="reference|boolean" name="textAllCaps"/></declare-styleable><declare-styleable name="MenuView"><attr name="android:itemTextAppearance"/><attr name="android:horizontalDivider"/><attr name="android:verticalDivider"/><attr name="android:headerBackground"/><attr name="android:itemBackground"/><attr name="android:windowAnimationStyle"/><attr name="android:itemIconDisabledAlpha"/><attr format="boolean" name="preserveIconSpacing"/></declare-styleable><declare-styleable name="ActionBar"><attr name="navigationMode"><enum name="normal" value="0"/><enum name="listMode" value="1"/><enum name="tabMode" value="2"/></attr><attr name="displayOptions"><flag name="none" value="0"/><flag name="useLogo" value="0x1"/><flag name="showHome" value="0x2"/><flag name="homeAsUp" value="0x4"/
><flag name="showTitle" value="0x8"/><flag name="showCustom" value="0x10"/><flag name="disableHome" value="0x20"/></attr><attr name="title"/><attr format="string" name="subtitle"/><attr format="reference" name="titleTextStyle"/><attr format="reference" name="subtitleTextStyle"/><attr format="reference" name="icon"/><attr format="reference" name="logo"/><attr format="reference" name="divider"/><attr format="reference" name="background"/><attr format="reference|color" name="backgroundStacked"/><attr format="reference|color" name="backgroundSplit"/><attr format="reference" name="customNavigationLayout"/><attr name="height"/><attr format="reference" name="homeLayout"/><attr format="reference" name="progressBarStyle"/><attr format="reference" name="indeterminateProgressStyle"/><attr format="dimension" name="progressBarPadding"/><attr name="homeAsUpIndicator"/><attr format="dimension" name="itemPadding"/><attr format="boolean" name="hideOnContentScroll"/><attr format="dimension" name="con
tentInsetStart"/><attr format="dimension" name="contentInsetEnd"/><attr format="dimension" name="contentInsetLeft"/><attr format="dimension" name="contentInsetRight"/><attr format="dimension" name="elevation"/><attr format="reference" name="popupTheme"/></declare-styleable><declare-styleable name="ActionMenuItemView"><attr name="android:minWidth"/></declare-styleable><declare-styleable name="MenuGroup"><attr name="android:id"/><attr name="android:menuCategory"/><attr name="android:orderInCategory"/><attr name="android:checkableBehavior"/><attr name="android:visible"/><attr name="android:enabled"/></declare-styleable><declare-styleable name="Toolbar"><attr format="reference" name="titleTextAppearance"/><attr format="reference" name="subtitleTextAppearance"/><attr name="title"/><attr name="subtitle"/><attr name="android:gravity"/><attr format="dimension" name="titleMargins"/><attr format="dimension" name="titleMarginStart"/><attr format="dimension" name="titleMarginEnd"/><attr format=
"dimension" name="titleMarginTop"/><attr format="dimension" name="titleMarginBottom"/><attr name="contentInsetStart"/><attr name="contentInsetEnd"/><attr name="contentInsetLeft"/><attr name="contentInsetRight"/><attr format="dimension" name="maxButtonHeight"/><attr format="reference" name="theme"/><attr format="reference" name="collapseIcon"/><attr format="string" name="collapseContentDescription"/><attr name="popupTheme"/><attr format="reference" name="navigationIcon"/><attr format="string" name="navigationContentDescription"/><attr name="android:minHeight"/></declare-styleable><declare-styleable name="LinearLayoutCompat_Layout"><attr name="android:layout_width"/><attr name="android:layout_height"/><attr name="android:layout_weight"/><attr name="android:layout_gravity"/></declare-styleable><declare-styleable name="CardView"><attr format="color" name="cardBackgroundColor"/><attr format="dimension" name="cardCornerRadius"/><attr format="dimension" name="cardElevation"/><attr format="
dimension" name="cardMaxElevation"/><attr format="boolean" name="cardUseCompatPadding"/><attr format="boolean" name="cardPreventCornerOverlap"/><attr format="dimension" name="contentPadding"/><attr format="dimension" name="contentPaddingLeft"/><attr format="dimension" name="contentPaddingRight"/><attr format="dimension" name="contentPaddingTop"/><attr format="dimension" name="contentPaddingBottom"/></declare-styleable><declare-styleable name="MenuItem"><attr name="android:id"/><attr name="android:menuCategory"/><attr name="android:orderInCategory"/><attr name="android:title"/><attr name="android:titleCondensed"/><attr name="android:icon"/><attr name="android:alphabeticShortcut"/><attr name="android:numericShortcut"/><attr name="android:checkable"/><attr name="android:checked"/><attr name="android:visible"/><attr name="android:enabled"/><attr name="android:onClick"/><attr name="showAsAction"><flag name="never" value="0"/><flag name="ifRoom" value="1"/><flag name="always" value="2"/><
flag name="withText" value="4"/><flag name="collapseActionView" value="8"/></attr><attr format="reference" name="actionLayout"/><attr format="string" name="actionViewClass"/><attr format="string" name="actionProviderClass"/></declare-styleable><declare-styleable name="View"><attr format="dimension" name="paddingStart"/><attr format="dimension" name="paddingEnd"/><attr name="android:focusable"/></declare-styleable><declare-styleable name="PopupWindowBackgroundState"><attr format="boolean" name="state_above_anchor"/></declare-styleable><declare-styleable name="LinearLayoutCompat"><attr name="android:orientation"/><attr name="android:gravity"/><attr name="android:baselineAligned"/><attr name="android:baselineAlignedChildIndex"/><attr name="android:weightSum"/><attr format="boolean" name="measureWithLargestChild"/><attr name="divider"/><attr name="showDividers"><flag name="none" value="0"/><flag name="beginning" value="1"/><flag name="middle" value="2"/><flag name="end" value="4"/></att
r><attr format="dimension" name="dividerPadding"/></declare-styleable><declare-styleable name="SearchView"><attr format="reference" name="layout"/><attr format="boolean" name="iconifiedByDefault"/><attr name="android:maxWidth"/><attr format="string" name="queryHint"/><attr name="android:imeOptions"/><attr name="android:inputType"/><attr format="reference" name="closeIcon"/><attr format="reference" name="goIcon"/><attr format="reference" name="searchIcon"/><attr format="reference" name="voiceIcon"/><attr format="reference" name="commitIcon"/><attr format="reference" name="suggestionRowLayout"/><attr format="reference" name="queryBackground"/><attr format="reference" name="submitBackground"/><attr name="android:focusable"/></declare-styleable><declare-styleable name="ActionMode"><attr name="titleTextStyle"/><attr name="subtitleTextStyle"/><attr name="background"/><attr name="backgroundSplit"/><attr name="height"/><attr format="reference" name="closeItemLayout"/></declare-styleable><de
clare-styleable name="Theme"><attr format="boolean" name="windowActionBar"/><attr format="boolean" name="windowActionBarOverlay"/><attr format="boolean" name="windowActionModeOverlay"/><attr format="dimension|fraction" name="windowFixedWidthMajor"/><attr format="dimension|fraction" name="windowFixedHeightMinor"/><attr format="dimension|fraction" name="windowFixedWidthMinor"/><attr format="dimension|fraction" name="windowFixedHeightMajor"/><attr name="android:windowIsFloating"/><attr name="android:windowAnimationStyle"/><attr format="reference" name="actionBarTabStyle"/><attr format="reference" name="actionBarTabBarStyle"/><attr format="reference" name="actionBarTabTextStyle"/><attr format="reference" name="actionOverflowButtonStyle"/><attr format="reference" name="actionOverflowMenuStyle"/><attr format="reference" name="actionBarPopupTheme"/><attr format="reference" name="actionBarStyle"/><attr format="reference" name="actionBarSplitStyle"/><attr format="reference" name="actionBarTh
eme"/><attr format="reference" name="actionBarWidgetTheme"/><attr format="dimension" name="actionBarSize"><enum name="wrap_content" value="0"/></attr><attr format="reference" name="actionBarDivider"/><attr format="reference" name="actionBarItemBackground"/><attr format="reference" name="actionMenuTextAppearance"/><attr format="color|reference" name="actionMenuTextColor"/><attr format="reference" name="actionModeStyle"/><attr format="reference" name="actionModeCloseButtonStyle"/><attr format="reference" name="actionModeBackground"/><attr format="reference" name="actionModeSplitBackground"/><attr format="reference" name="actionModeCloseDrawable"/><attr format="reference" name="actionModeCutDrawable"/><attr format="reference" name="actionModeCopyDrawable"/><attr format="reference" name="actionModePasteDrawable"/><attr format="reference" name="actionModeSelectAllDrawable"/><attr format="reference" name="actionModeShareDrawable"/><attr format="reference" name="actionModeFindDrawable"/><a
ttr format="reference" name="actionModeWebSearchDrawable"/><attr format="reference" name="actionModePopupWindowStyle"/><attr format="reference" name="textAppearanceLargePopupMenu"/><attr format="reference" name="textAppearanceSmallPopupMenu"/><attr format="reference" name="actionDropDownStyle"/><attr format="dimension" name="dropdownListPreferredItemHeight"/><attr format="reference" name="spinnerStyle"/><attr format="reference" name="spinnerDropDownItemStyle"/><attr format="reference" name="homeAsUpIndicator"/><attr format="reference" name="actionButtonStyle"/><attr format="reference" name="buttonBarStyle"/><attr format="reference" name="buttonBarButtonStyle"/><attr format="reference" name="selectableItemBackground"/><attr format="reference" name="selectableItemBackgroundBorderless"/><attr format="reference" name="dividerVertical"/><attr format="reference" name="dividerHorizontal"/><attr format="reference" name="activityChooserViewStyle"/><attr format="reference" name="toolbarStyle"
/><attr format="reference" name="toolbarNavigationButtonStyle"/><attr format="reference" name="popupMenuStyle"/><attr format="reference" name="popupWindowStyle"/><attr format="reference|color" name="editTextColor"/><attr format="reference" name="editTextBackground"/><attr format="reference" name="switchStyle"/><attr format="reference" name="textAppearanceSearchResultTitle"/><attr format="reference" name="textAppearanceSearchResultSubtitle"/><attr format="reference|color" name="textColorSearchUrl"/><attr format="reference" name="searchViewStyle"/><attr format="dimension" name="listPreferredItemHeight"/><attr format="dimension" name="listPreferredItemHeightSmall"/><attr format="dimension" name="listPreferredItemHeightLarge"/><attr format="dimension" name="listPreferredItemPaddingLeft"/><attr format="dimension" name="listPreferredItemPaddingRight"/><attr format="reference" name="dropDownListViewStyle"/><attr format="reference" name="listPopupWindowStyle"/><attr format="reference" name=
"textAppearanceListItem"/><attr format="reference" name="textAppearanceListItemSmall"/><attr format="reference" name="panelBackground"/><attr format="dimension" name="panelMenuListWidth"/><attr format="reference" name="panelMenuListTheme"/><attr format="reference" name="listChoiceBackgroundIndicator"/><attr format="color" name="colorPrimary"/><attr format="color" name="colorPrimaryDark"/><attr format="color" name="colorAccent"/><attr format="color" name="colorControlNormal"/><attr format="color" name="colorControlActivated"/><attr format="color" name="colorControlHighlight"/><attr format="color" name="colorButtonNormal"/><attr format="color" name="colorSwitchThumbNormal"/></declare-styleable><declare-styleable name="ActionMenuView"/><declare-styleable name="SwitchCompat"><attr name="android:thumb"/><attr format="reference" name="track"/><attr name="android:textOn"/><attr name="android:textOff"/><attr format="dimension" name="thumbTextPadding"/><attr format="reference" name="switchTe
xtAppearance"/><attr format="dimension" name="switchMinWidth"/><attr format="dimension" name="switchPadding"/><attr format="boolean" name="splitTrack"/><attr format="boolean" name="showText"/></declare-styleable></configuration></mergedItems></merger>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/05a2c718/app/build/intermediates/manifests/full/debug/AndroidManifest.xml
----------------------------------------------------------------------
diff --git a/app/build/intermediates/manifests/full/debug/AndroidManifest.xml b/app/build/intermediates/manifests/full/debug/AndroidManifest.xml
index b2f76b1..1da1025 100644
--- a/app/build/intermediates/manifests/full/debug/AndroidManifest.xml
+++ b/app/build/intermediates/manifests/full/debug/AndroidManifest.xml
@@ -71,13 +71,21 @@ limitations under the License.
<receiver
android:name="org.apache.taverna.mobile.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>
<activity
+ android:name="org.apache.taverna.mobile.activities.SettingsActivity"
+ android:label="@string/title_activity_settings"
+ android:parentActivityName="org.apache.taverna.mobile.activities.DashboardMainActivity" >
+ <meta-data
+ android:name="android.support.PARENT_ACTIVITY"
+ android:value="org.apache.taverna.mobile.activities.DashboardMainActivity" />
+ </activity>
+ <activity
android:name="android.support.v7.widget.TestActivity"
android:label="RecyclerViewTestActivity" />
</application>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/05a2c718/app/build/intermediates/res/debug/layout/fragment_item_grid.xml
----------------------------------------------------------------------
diff --git a/app/build/intermediates/res/debug/layout/fragment_item_grid.xml b/app/build/intermediates/res/debug/layout/fragment_item_grid.xml
index 9938f2a..5cef01e 100644
--- a/app/build/intermediates/res/debug/layout/fragment_item_grid.xml
+++ b/app/build/intermediates/res/debug/layout/fragment_item_grid.xml
@@ -22,7 +22,10 @@ limitations under the License.
<!-- <GridView android:id="@+id/gridlist"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:numColumns="2">-->
+ android:numColumns="2">--> <android.support.v4.widget.SwipeRefreshLayout
+ android:id="@+id/refresh"
+ android:layout_height="match_parent"
+ android:layout_width="match_parent">
<android.support.v7.widget.RecyclerView
xmlns:recycler_view="http://schemas.android.com/apk/res-auto"
android:id="@android:id/list"
@@ -32,7 +35,7 @@ limitations under the License.
android:background="@color/button_material_light"
></android.support.v7.widget.RecyclerView>
<!-- </GridView>-->
-
+</android.support.v4.widget.SwipeRefreshLayout>
<TextView android:id="@android:id/empty"
android:layout_width="match_parent"
android:layout_height="match_parent"
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/05a2c718/app/build/intermediates/res/debug/layout/fragment_item_list.xml
----------------------------------------------------------------------
diff --git a/app/build/intermediates/res/debug/layout/fragment_item_list.xml b/app/build/intermediates/res/debug/layout/fragment_item_list.xml
index 0381ec6..6037a95 100644
--- a/app/build/intermediates/res/debug/layout/fragment_item_list.xml
+++ b/app/build/intermediates/res/debug/layout/fragment_item_list.xml
@@ -27,17 +27,21 @@ limitations under the License.
<!--<ListView android:id="@android:id/list" android:layout_width="match_parent"-->
<!--android:layout_height="match_parent" />-->
+ <android.support.v4.widget.SwipeRefreshLayout
+ android:id="@+id/refresh"
+ android:layout_height="match_parent"
+ android:layout_width="match_parent">
<android.support.v7.widget.RecyclerView
xmlns:recycler_view="http://schemas.android.com/apk/res-auto"
android:id="@android:id/list"
android:theme="@style/Theme.AppCompat.Light"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
+ android:layout_height="match_parent"
android:background="@color/button_material_light"
>
</android.support.v7.widget.RecyclerView>
-
+</android.support.v4.widget.SwipeRefreshLayout>
<TextView
android:id="@android:id/empty"
android:layout_width="match_parent"
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/05a2c718/app/build/intermediates/res/debug/layout/fragment_login.xml
----------------------------------------------------------------------
diff --git a/app/build/intermediates/res/debug/layout/fragment_login.xml b/app/build/intermediates/res/debug/layout/fragment_login.xml
index 7845c46..d0e8612 100644
--- a/app/build/intermediates/res/debug/layout/fragment_login.xml
+++ b/app/build/intermediates/res/debug/layout/fragment_login.xml
@@ -110,6 +110,12 @@ limitations under the License.
android:drawableStart="@android:drawable/ic_secure"
android:drawableLeft="@android:drawable/ic_secure"/>
+ <CheckBox
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/keeplogin"
+ android:id="@+id/rememberCheckbox" />
+
<Button
android:layout_width="wrap_content"
android:layout_height="wrap_content"
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/05a2c718/app/build/intermediates/res/debug/layout/fragment_workflow_detail.xml
----------------------------------------------------------------------
diff --git a/app/build/intermediates/res/debug/layout/fragment_workflow_detail.xml b/app/build/intermediates/res/debug/layout/fragment_workflow_detail.xml
index 433f0f4..1c32536 100644
--- a/app/build/intermediates/res/debug/layout/fragment_workflow_detail.xml
+++ b/app/build/intermediates/res/debug/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/05a2c718/app/build/intermediates/res/debug/layout/workflow_item_layout.xml
----------------------------------------------------------------------
diff --git a/app/build/intermediates/res/debug/layout/workflow_item_layout.xml b/app/build/intermediates/res/debug/layout/workflow_item_layout.xml
index 530e8d0..dfc4b97 100644
--- a/app/build/intermediates/res/debug/layout/workflow_item_layout.xml
+++ b/app/build/intermediates/res/debug/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"
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/05a2c718/app/build/intermediates/res/debug/layout/workflow_layout.xml
----------------------------------------------------------------------
diff --git a/app/build/intermediates/res/debug/layout/workflow_layout.xml b/app/build/intermediates/res/debug/layout/workflow_layout.xml
index d09fd8c..3ff26f0 100644
--- a/app/build/intermediates/res/debug/layout/workflow_layout.xml
+++ b/app/build/intermediates/res/debug/layout/workflow_layout.xml
@@ -19,8 +19,11 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:orientation="vertical" android:layout_width="match_parent"
+ android:orientation="vertical"
+ android:layout_width="match_parent"
android:layout_height="match_parent">
+
+
<android.support.v7.widget.RecyclerView
xmlns:recycler_view="http://schemas.android.com/apk/res-auto"
android:id="@+id/recycler_list"
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/05a2c718/app/build/intermediates/res/debug/mipmap-hdpi-v4/ic_dashboard_home.png
----------------------------------------------------------------------
diff --git a/app/build/intermediates/res/debug/mipmap-hdpi-v4/ic_dashboard_home.png b/app/build/intermediates/res/debug/mipmap-hdpi-v4/ic_dashboard_home.png
new file mode 100644
index 0000000..4da65ef
Binary files /dev/null and b/app/build/intermediates/res/debug/mipmap-hdpi-v4/ic_dashboard_home.png differ
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/05a2c718/app/build/intermediates/res/debug/mipmap-mdpi-v4/ic_dashboard_home.png
----------------------------------------------------------------------
diff --git a/app/build/intermediates/res/debug/mipmap-mdpi-v4/ic_dashboard_home.png b/app/build/intermediates/res/debug/mipmap-mdpi-v4/ic_dashboard_home.png
new file mode 100644
index 0000000..d40c972
Binary files /dev/null and b/app/build/intermediates/res/debug/mipmap-mdpi-v4/ic_dashboard_home.png differ
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/05a2c718/app/build/intermediates/res/debug/mipmap-xhdpi-v4/ic_dashboard_home.png
----------------------------------------------------------------------
diff --git a/app/build/intermediates/res/debug/mipmap-xhdpi-v4/ic_dashboard_home.png b/app/build/intermediates/res/debug/mipmap-xhdpi-v4/ic_dashboard_home.png
new file mode 100644
index 0000000..8c916e0
Binary files /dev/null and b/app/build/intermediates/res/debug/mipmap-xhdpi-v4/ic_dashboard_home.png differ
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/05a2c718/app/build/intermediates/res/debug/mipmap-xxhdpi-v4/ic_dashboard_home.png
----------------------------------------------------------------------
diff --git a/app/build/intermediates/res/debug/mipmap-xxhdpi-v4/ic_dashboard_home.png b/app/build/intermediates/res/debug/mipmap-xxhdpi-v4/ic_dashboard_home.png
new file mode 100644
index 0000000..632cbe6
Binary files /dev/null and b/app/build/intermediates/res/debug/mipmap-xxhdpi-v4/ic_dashboard_home.png differ
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/05a2c718/app/build/intermediates/res/debug/mipmap-xxxhdpi-v4/ic_dashboard_home.png
----------------------------------------------------------------------
diff --git a/app/build/intermediates/res/debug/mipmap-xxxhdpi-v4/ic_dashboard_home.png b/app/build/intermediates/res/debug/mipmap-xxxhdpi-v4/ic_dashboard_home.png
new file mode 100644
index 0000000..313f03e
Binary files /dev/null and b/app/build/intermediates/res/debug/mipmap-xxxhdpi-v4/ic_dashboard_home.png differ
[04/12] incubator-taverna-mobile git commit: Added pull to refresh
functionality as simple view from android support library not third party
library
Posted by ia...@apache.org.
Added pull to refresh functionality as simple view from android support library not third party 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/4f660cbf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/4f660cbf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/4f660cbf
Branch: refs/heads/master
Commit: 4f660cbf5f5bfa6b21f64c573919935093bb6b5a
Parents: 324da9c
Author: larrytech7 <la...@gmail.com>
Authored: Mon Jun 15 19:32:49 2015 +0100
Committer: larrytech7 <la...@gmail.com>
Committed: Mon Jun 15 19:32:49 2015 +0100
----------------------------------------------------------------------
.../activities/WorkflowDetailActivity.java | 1 -
.../mobile/fragments/WorkflowItemFragment.java | 32 +++++++++-----------
app/src/main/res/layout/fragment_item_list.xml | 6 +++-
app/src/main/res/layout/workflow_layout.xml | 5 ++-
app/src/main/res/values/strings.xml | 3 +-
5 files changed, 26 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/4f660cbf/app/src/main/java/org/apache/taverna/mobile/activities/WorkflowDetailActivity.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/activities/WorkflowDetailActivity.java b/app/src/main/java/org/apache/taverna/mobile/activities/WorkflowDetailActivity.java
index 98c80f8..7c43b73 100644
--- a/app/src/main/java/org/apache/taverna/mobile/activities/WorkflowDetailActivity.java
+++ b/app/src/main/java/org/apache/taverna/mobile/activities/WorkflowDetailActivity.java
@@ -63,7 +63,6 @@ public class WorkflowDetailActivity extends ActionBarActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
- supportRequestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_workflow_detail);
// Create the adapter that will return a fragment for each of the three
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/4f660cbf/app/src/main/java/org/apache/taverna/mobile/fragments/WorkflowItemFragment.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/fragments/WorkflowItemFragment.java b/app/src/main/java/org/apache/taverna/mobile/fragments/WorkflowItemFragment.java
index 798cbf2..5793b33 100644
--- a/app/src/main/java/org/apache/taverna/mobile/fragments/WorkflowItemFragment.java
+++ b/app/src/main/java/org/apache/taverna/mobile/fragments/WorkflowItemFragment.java
@@ -25,10 +25,10 @@ package org.apache.taverna.mobile.fragments;
*/
import android.app.Activity;
+import android.app.ProgressDialog;
import android.os.Bundle;
import android.support.v4.app.Fragment;
-import android.support.v4.app.LoaderManager;
-import android.support.v4.content.Loader;
+import android.support.v4.widget.SwipeRefreshLayout;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import android.view.LayoutInflater;
@@ -37,11 +37,8 @@ import android.view.MenuInflater;
import android.view.MenuItem;
import android.view.View;
import android.view.ViewGroup;
-import android.view.Window;
import android.view.animation.Animation;
import android.view.animation.AnimationUtils;
-import android.widget.AdapterView;
-import android.widget.ProgressBar;
import android.widget.TextView;
import org.apache.taverna.mobile.R;
@@ -62,14 +59,14 @@ import java.util.List;
* Activities containing this fragment MUST implement the {@link org.apache.taverna.mobile.fragments.WorkflowItemFragment.OnWorkflowSelectedListener}
* interface.
*/
-public class WorkflowItemFragment extends Fragment implements android.app.LoaderManager.LoaderCallbacks<List<Workflow>> {
+public class WorkflowItemFragment extends Fragment implements android.app.LoaderManager.LoaderCallbacks<List<Workflow>>, SwipeRefreshLayout.OnRefreshListener {
// TODO: Rename parameter arguments, choose names that match
// the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
private static final String ARG_PARAM1 = "param1";
private static final String ARG_PARAM2 = "param2";
private Animation in;
- private ProgressBar wpb; //progressbar used to indicate the state of the workflow loaders
+ private ProgressDialog mProgressDialog; //progressbar used to indicate the state of the workflow loaders
// TODO: Rename and change types of parameters
private String mParam1;
@@ -81,6 +78,7 @@ public class WorkflowItemFragment extends Fragment implements android.app.Loader
* The fragment's ListView/GridView.
*/
private RecyclerView mListView;
+ private SwipeRefreshLayout swipeRefreshLayout;
/**
* The Adapter which will be used to populate the ListView/GridView with
@@ -129,7 +127,8 @@ public class WorkflowItemFragment extends Fragment implements android.app.Loader
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,Bundle savedInstanceState) {
View view = inflater.inflate(R.layout.fragment_item, container, false);
- wpb = (ProgressBar) view.findViewById(R.id.workflow_pb);
+ swipeRefreshLayout = (SwipeRefreshLayout) view.findViewById(R.id.refresh);
+ swipeRefreshLayout.setOnRefreshListener(this);
// Set the adapter
mListView = (RecyclerView) view.findViewById(android.R.id.list);
mListView.setHasFixedSize(true);
@@ -235,24 +234,18 @@ public class WorkflowItemFragment extends Fragment implements android.app.Loader
*/
@Override
public android.content.Loader<List<Workflow>> onCreateLoader(int id, Bundle args) {
- if (null != wpb)
- wpb.setVisibility(View.VISIBLE);
+ swipeRefreshLayout.setRefreshing(true);
return new WorkflowLoader(getActivity());
}
@Override
public void onLoadFinished(android.content.Loader<List<Workflow>> loader, List<Workflow> workflows) {
- // getActivity().setProgressBarIndeterminateVisibility(false);
- if (null != wpb)
- wpb.setVisibility(View.GONE);
+ swipeRefreshLayout.setRefreshing(false);
loader.stopLoading();
workflowAdapter = new WorkflowAdapter(getActivity(), workflows);
if(workflows.size() > 0)
mListView.swapAdapter(workflowAdapter, true);
- else {
- // mListView.setVisibility(View.GONE);
-// setEmptyText("No views available");
- }
+
}
@Override
@@ -261,6 +254,11 @@ public class WorkflowItemFragment extends Fragment implements android.app.Loader
mListView.swapAdapter(null, false);
}
+ @Override
+ public void onRefresh() {
+ getActivity().getLoaderManager().initLoader(0,null,this);
+ }
+
/**
* This interface must be implemented by activities that contain this
* fragment to allow an interaction in this fragment to be communicated
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/4f660cbf/app/src/main/res/layout/fragment_item_list.xml
----------------------------------------------------------------------
diff --git a/app/src/main/res/layout/fragment_item_list.xml b/app/src/main/res/layout/fragment_item_list.xml
index 522164c..9852dfb 100644
--- a/app/src/main/res/layout/fragment_item_list.xml
+++ b/app/src/main/res/layout/fragment_item_list.xml
@@ -27,6 +27,10 @@ limitations under the License.
<!--<ListView android:id="@android:id/list" android:layout_width="match_parent"-->
<!--android:layout_height="match_parent" />-->
+ <android.support.v4.widget.SwipeRefreshLayout
+ android:id="@+id/refresh"
+ android:layout_height="match_parent"
+ android:layout_width="match_parent">
<android.support.v7.widget.RecyclerView
xmlns:recycler_view="http://schemas.android.com/apk/res-auto"
android:id="@android:id/list"
@@ -37,7 +41,7 @@ limitations under the License.
>
</android.support.v7.widget.RecyclerView>
-
+</android.support.v4.widget.SwipeRefreshLayout>
<TextView
android:id="@android:id/empty"
android:layout_width="match_parent"
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/4f660cbf/app/src/main/res/layout/workflow_layout.xml
----------------------------------------------------------------------
diff --git a/app/src/main/res/layout/workflow_layout.xml b/app/src/main/res/layout/workflow_layout.xml
index 564979c..6bc3160 100644
--- a/app/src/main/res/layout/workflow_layout.xml
+++ b/app/src/main/res/layout/workflow_layout.xml
@@ -19,8 +19,11 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:orientation="vertical" android:layout_width="match_parent"
+ android:orientation="vertical"
+ android:layout_width="match_parent"
android:layout_height="match_parent">
+
+
<android.support.v7.widget.RecyclerView
xmlns:recycler_view="http://schemas.android.com/apk/res-auto"
android:id="@+id/recycler_list"
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/4f660cbf/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 309ad1c..e7b2221 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -53,7 +53,7 @@ limitations under the License.
<string name="workflow_download">Download</string>
<string name="workflow_read">View</string>
<string name="workflow_mark">Favorite</string>
- <string name="workflow_authorhint">Workflow Author</string>
+ <string name="workflow_authorhint">Workflow Author </string>
<string name="workflow_component">Workflow component</string>
<string name="favorite_empty"> No Favorites Added Yet</string>
<string name="workflow_empty"> No <b>Workflows</b> Available. Check your Connection to the Internet</string>
@@ -78,5 +78,6 @@ limitations under the License.
<string name="downloadcomplete"> download complete</string>
<string name="seemore"> See more &raquo</string>
<string name="loading">Loading details</string>
+ <string name="loadworkflows">Loading Workflows</string>
</resources>
[08/12] incubator-taverna-mobile git commit: implemented workflow
search by author and title
Posted by ia...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/05a2c718/app/build/intermediates/res/debug/values/values.xml
----------------------------------------------------------------------
diff --git a/app/build/intermediates/res/debug/values/values.xml b/app/build/intermediates/res/debug/values/values.xml
index 0172c45..8cf71d3 100644
--- a/app/build/intermediates/res/debug/values/values.xml
+++ b/app/build/intermediates/res/debug/values/values.xml
@@ -223,10 +223,14 @@
<string name="downloaderror">Unable to start Download. Check your internet connectivity</string>
<string name="downloadfailed">Download Failed. Please try again</string>
<string name="downloadprogress">Workflow download in progress</string>
+ <string name="emailerr">Email must not be empty</string>
<string name="favorite_empty"> No Favorites Added Yet</string>
+ <string name="fetchrun">Fetching run components </string>
<string name="hello_blank_fragment"> About Workflow </string>
<string name="hello_world"> Empty </string>
+ <string name="keeplogin">Remain Logged-in</string>
<string name="loading">Loading details</string>
+ <string name="loadworkflows">Loading Workflows</string>
<string name="loginbutton">Login</string>
<string name="loginpassword">Password</string>
<string name="loginusername">Email or Username</string>
@@ -235,12 +239,31 @@
<string name="modified">Modified :</string>
<string name="navigation_drawer_close">Close navigation drawer</string>
<string name="navigation_drawer_open">Open navigation drawer</string>
+ <string name="passworderr">Password must not be empty</string>
<string name="play_workflow">Create Run</string>
+ <!-- From: file:/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/values/strings_activity_settings.xml -->
+ <eat-comment/>
+ <string name="pref_header_general">General</string>
+ <string name="pref_login_description">Decide whether or not to be automatically logged-in when next the app starts</string>
+ <string name="pref_player_default"> http://heater.cs.man.ac.uk:3000/</string>
+ <string name="pref_player_des">Configure a different player URL for the app to use. End with the mount point(/)</string>
+ <string name="pref_player_title">Configure Taverna player portal</string>
+ <string name="pref_remainLogged_in">Remain Logged-in</string>
+ <string name="pref_server_default"> http://heater.cs.man.ac.uk:8090/taverna-2.5.4/</string>
+ <string name="pref_server_des">Configure a different Taverna Server for the app</string>
+ <string name="pref_server_title">Configure Taverna Server </string>
+ <!-- From: file:/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/values/strings.xml -->
+ <eat-comment/>
<string name="search_hint"> Search workflows by name</string>
<string name="seemore"> See more &raquo</string>
<string name="title_about">About </string>
<string name="title_activity_dashboard_main">Dashboard</string>
<string name="title_activity_flash_screen">Taverna Mobile</string>
+ <!-- From: file:/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/values/strings_activity_settings.xml -->
+ <eat-comment/>
+ <string name="title_activity_settings">Settings</string>
+ <!-- From: file:/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/values/strings.xml -->
+ <eat-comment/>
<string name="title_activity_workflow_detail">Workflow Detail</string>
<string name="title_exit">Logout</string>
<string name="title_explore">Workflows</string>
@@ -248,7 +271,7 @@
<string name="title_openworkflow">Open Workflow</string>
<string name="title_usage">Usage</string>
<string name="wktitle">TITLE</string>
- <string name="workflow_authorhint">Workflow Author</string>
+ <string name="workflow_authorhint">Workflow Author </string>
<string name="workflow_component">Workflow component</string>
<string name="workflow_download">Download</string>
<string name="workflow_empty"> No <b>Workflows</b> Available. Check your Connection to the Internet</string>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/05a2c718/app/build/intermediates/res/debug/xml/pref_general.xml
----------------------------------------------------------------------
diff --git a/app/build/intermediates/res/debug/xml/pref_general.xml b/app/build/intermediates/res/debug/xml/pref_general.xml
new file mode 100644
index 0000000..e0fa2d7
--- /dev/null
+++ b/app/build/intermediates/res/debug/xml/pref_general.xml
@@ -0,0 +1,34 @@
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <CheckBoxPreference
+ android:key="pref_logged_in"
+ android:title="@string/pref_remainLogged_in"
+ android:summary="@string/pref_login_description"
+ android:defaultValue="true" />
+
+ <!-- NOTE: EditTextPreference accepts EditText attributes. -->
+ <!-- NOTE: EditTextPreference's summary should be set to its value by the activity code. -->
+ <EditTextPreference
+ android:key="pref_player_url"
+ android:title="@string/pref_player_title"
+ android:summary="@string/pref_player_des"
+ android:defaultValue="@string/pref_player_default"
+ android:selectAllOnFocus="true"
+ android:inputType="textCapWords"
+ android:capitalize="words"
+ android:singleLine="true"
+ android:maxLines="1" />
+ <EditTextPreference
+ android:key="pref_server_url"
+ android:title="@string/pref_server_title"
+ android:summary="@string/pref_server_des"
+ android:defaultValue="@string/pref_server_default"
+ android:selectAllOnFocus="true"
+ android:inputType="textCapWords"
+ android:capitalize="words"
+ android:singleLine="true"
+ android:maxLines="1" />
+
+
+</PreferenceScreen>
+<!-- From: file:/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/xml/pref_general.xml -->
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/05a2c718/app/build/intermediates/res/debug/xml/pref_headers.xml
----------------------------------------------------------------------
diff --git a/app/build/intermediates/res/debug/xml/pref_headers.xml b/app/build/intermediates/res/debug/xml/pref_headers.xml
new file mode 100644
index 0000000..bd1f810
--- /dev/null
+++ b/app/build/intermediates/res/debug/xml/pref_headers.xml
@@ -0,0 +1,10 @@
+<preference-headers xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <!-- These settings headers are only used on tablets. -->
+
+ <header
+ android:fragment="org.apache.taverna.mobile.activities.SettingsActivity$GeneralPreferenceFragment"
+ android:title="@string/pref_header_general" />
+
+</preference-headers>
+<!-- From: file:/root/Desktop/AndroidLab/TavernaMobile2/app/src/main/res/xml/pref_headers.xml -->
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/05a2c718/app/build/intermediates/resources/resources-debug.ap_
----------------------------------------------------------------------
diff --git a/app/build/intermediates/resources/resources-debug.ap_ b/app/build/intermediates/resources/resources-debug.ap_
index cd1cacd..48ebfa5 100644
Binary files a/app/build/intermediates/resources/resources-debug.ap_ and b/app/build/intermediates/resources/resources-debug.ap_ differ
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/05a2c718/app/build/intermediates/symbols/debug/R.txt
----------------------------------------------------------------------
diff --git a/app/build/intermediates/symbols/debug/R.txt b/app/build/intermediates/symbols/debug/R.txt
index f315ebb..9bf149b 100644
--- a/app/build/intermediates/symbols/debug/R.txt
+++ b/app/build/intermediates/symbols/debug/R.txt
@@ -378,8 +378,8 @@ int drawable ic_viewworkflow 0x7f020040
int drawable round_shape 0x7f020041
int drawable sliding_header 0x7f020042
int drawable tavernalogo 0x7f020043
-int id aboutworkflowTextView 0x7f0b0063
-int id actionLayout 0x7f0b006b
+int id aboutworkflowTextView 0x7f0b0065
+int id actionLayout 0x7f0b006d
int id action_bar 0x7f0b0031
int id action_bar_activity_content 0x7f0b0000
int id action_bar_container 0x7f0b0030
@@ -393,16 +393,16 @@ int id action_menu_presenter 0x7f0b0003
int id action_mode_bar 0x7f0b002e
int id action_mode_bar_stub 0x7f0b002d
int id action_mode_close_button 0x7f0b0020
-int id action_search 0x7f0b0085
-int id action_settings 0x7f0b0086
+int id action_search 0x7f0b0087
+int id action_settings 0x7f0b0088
int id activity_chooser_view_content 0x7f0b0021
int id always 0x7f0b0016
int id author 0x7f0b0049
int id author_profile_image 0x7f0b004b
int id beginning 0x7f0b0013
-int id button_download_workflow 0x7f0b007a
-int id button_mark_workflow 0x7f0b007b
-int id button_view_workflow 0x7f0b0079
+int id button_download_workflow 0x7f0b007c
+int id button_mark_workflow 0x7f0b007d
+int id button_view_workflow 0x7f0b007b
int id checkbox 0x7f0b0029
int id collapseActionView 0x7f0b0017
int id container 0x7f0b0042
@@ -413,12 +413,12 @@ int id decor_content_parent 0x7f0b002f
int id default_activity_button 0x7f0b0024
int id dialog 0x7f0b001b
int id disableHome 0x7f0b000c
-int id download_wk 0x7f0b006d
+int id download_wk 0x7f0b006f
int id drawer_layout 0x7f0b003f
int id dropdown 0x7f0b001c
-int id editTextUsername 0x7f0b005a
+int id editTextUsername 0x7f0b005b
int id edit_query 0x7f0b0033
-int id edittextPassword 0x7f0b005c
+int id edittextPassword 0x7f0b005d
int id end 0x7f0b0014
int id expand_activities_button 0x7f0b0022
int id expanded_menu 0x7f0b0028
@@ -428,24 +428,24 @@ int id homeAsUp 0x7f0b000d
int id icon 0x7f0b0026
int id ifRoom 0x7f0b0018
int id image 0x7f0b0023
-int id imageButtonState 0x7f0b0083
+int id imageButtonState 0x7f0b0085
int id imageView 0x7f0b0044
int id imageView2 0x7f0b0045
-int id imageView3 0x7f0b005f
-int id imageView4 0x7f0b0060
-int id layoutinfo 0x7f0b0076
+int id imageView3 0x7f0b0061
+int id imageView4 0x7f0b0062
+int id layoutinfo 0x7f0b0078
int id linearlayout_workflow_info 0x7f0b004a
int id listMode 0x7f0b0009
int id list_item 0x7f0b0025
-int id loginbutton 0x7f0b005d
-int id loginlayout 0x7f0b0057
-int id logo 0x7f0b0055
-int id mark_wk 0x7f0b006e
-int id menuIcon 0x7f0b0070
-int id menuItemText 0x7f0b0071
+int id loginbutton 0x7f0b005f
+int id loginlayout 0x7f0b0058
+int id logo 0x7f0b0056
+int id mark_wk 0x7f0b0070
+int id menuIcon 0x7f0b0072
+int id menuItemText 0x7f0b0073
int id middle 0x7f0b0015
int id navigation_drawer 0x7f0b0043
-int id navigation_drawer_listview 0x7f0b0061
+int id navigation_drawer_listview 0x7f0b0063
int id never 0x7f0b0019
int id none 0x7f0b000e
int id normal 0x7f0b000a
@@ -455,12 +455,14 @@ int id progressBar 0x7f0b0048
int id progress_circular 0x7f0b0005
int id progress_horizontal 0x7f0b0006
int id radio 0x7f0b002b
-int id recycler_list 0x7f0b007c
-int id run_wk 0x7f0b006c
-int id runfinished 0x7f0b0082
-int id runstarted 0x7f0b007f
-int id runtitle 0x7f0b007d
-int id scrollView 0x7f0b0065
+int id recycler_list 0x7f0b007e
+int id refresh 0x7f0b0054
+int id rememberCheckbox 0x7f0b005e
+int id run_wk 0x7f0b006e
+int id runfinished 0x7f0b0084
+int id runstarted 0x7f0b0081
+int id runtitle 0x7f0b007f
+int id scrollView 0x7f0b0067
int id search_badge 0x7f0b0035
int id search_bar 0x7f0b0034
int id search_button 0x7f0b0036
@@ -475,44 +477,44 @@ int id shortcut 0x7f0b002a
int id showCustom 0x7f0b000f
int id showHome 0x7f0b0010
int id showTitle 0x7f0b0011
-int id show_more 0x7f0b0075
+int id show_more 0x7f0b0077
int id split_action_bar 0x7f0b0007
int id submit_area 0x7f0b003c
int id tabMode 0x7f0b000b
-int id textState 0x7f0b0084
+int id textState 0x7f0b0086
int id textView 0x7f0b0046
int id textView10 0x7f0b004e
int id textView11 0x7f0b0050
int id textView12 0x7f0b0052
-int id textView13 0x7f0b007e
-int id textView14 0x7f0b0080
-int id textView15 0x7f0b0081
+int id textView13 0x7f0b0080
+int id textView14 0x7f0b0082
+int id textView15 0x7f0b0083
int id textView2 0x7f0b0047
-int id textView3 0x7f0b0056
-int id textView4 0x7f0b0058
-int id textView5 0x7f0b0059
-int id textView6 0x7f0b005b
-int id textView7 0x7f0b005e
-int id textView8 0x7f0b0062
+int id textView3 0x7f0b0057
+int id textView4 0x7f0b0059
+int id textView5 0x7f0b005a
+int id textView6 0x7f0b005c
+int id textView7 0x7f0b0060
+int id textView8 0x7f0b0064
int id textView9 0x7f0b004c
int id title 0x7f0b0027
int id up 0x7f0b0008
int id useLogo 0x7f0b0012
-int id wcreatedat 0x7f0b0067
-int id wdescription 0x7f0b0069
+int id wcreatedat 0x7f0b0069
+int id wdescription 0x7f0b006b
int id withText 0x7f0b001a
-int id wkf_author 0x7f0b0064
-int id wkf_image 0x7f0b006a
-int id wkll 0x7f0b0072
-int id workflow_author 0x7f0b0073
-int id workflow_brief_description 0x7f0b0077
-int id workflow_image 0x7f0b0078
-int id workflow_pb 0x7f0b0054
-int id workflow_title 0x7f0b0074
-int id workflowpolicyTextView 0x7f0b006f
+int id wkf_author 0x7f0b0066
+int id wkf_image 0x7f0b006c
+int id wkll 0x7f0b0074
+int id workflow_author 0x7f0b0075
+int id workflow_brief_description 0x7f0b0079
+int id workflow_image 0x7f0b007a
+int id workflow_pb 0x7f0b0055
+int id workflow_title 0x7f0b0076
+int id workflowpolicyTextView 0x7f0b0071
int id wrap_content 0x7f0b001d
-int id wtitle 0x7f0b0066
-int id wupdatedat 0x7f0b0068
+int id wtitle 0x7f0b0068
+int id wupdatedat 0x7f0b006a
int integer abc_config_activityDefaultDur 0x7f0c0000
int integer abc_config_activityShortDur 0x7f0c0001
int integer abc_max_action_buttons 0x7f0c0002
@@ -562,18 +564,19 @@ int menu dashboard_main 0x7f0f0000
int menu global 0x7f0f0001
int menu menu_workflow_detail 0x7f0f0002
int mipmap ic_about 0x7f030000
-int mipmap ic_launcher 0x7f030001
-int mipmap ic_logout 0x7f030002
-int mipmap ic_markworkflow_selected 0x7f030003
-int mipmap ic_markworkflow_unselected 0x7f030004
-int mipmap ic_openwk 0x7f030005
-int mipmap ic_poweredby 0x7f030006
-int mipmap ic_quit 0x7f030007
-int mipmap ic_usage 0x7f030008
-int mipmap ic_user 0x7f030009
-int mipmap ic_viewworkflow 0x7f03000a
-int mipmap ic_workflows 0x7f03000b
-int mipmap icuserprofiles 0x7f03000c
+int mipmap ic_dashboard_home 0x7f030001
+int mipmap ic_launcher 0x7f030002
+int mipmap ic_logout 0x7f030003
+int mipmap ic_markworkflow_selected 0x7f030004
+int mipmap ic_markworkflow_unselected 0x7f030005
+int mipmap ic_openwk 0x7f030006
+int mipmap ic_poweredby 0x7f030007
+int mipmap ic_quit 0x7f030008
+int mipmap ic_usage 0x7f030009
+int mipmap ic_user 0x7f03000a
+int mipmap ic_viewworkflow 0x7f03000b
+int mipmap ic_workflows 0x7f03000c
+int mipmap icuserprofiles 0x7f03000d
int string Logininfo 0x7f0d0000
int string abc_action_bar_home_description 0x7f0d0001
int string abc_action_bar_home_description_format 0x7f0d0002
@@ -607,37 +610,52 @@ int string downloadduplicate 0x7f0d001d
int string downloaderror 0x7f0d001e
int string downloadfailed 0x7f0d001f
int string downloadprogress 0x7f0d0020
-int string favorite_empty 0x7f0d0021
-int string hello_blank_fragment 0x7f0d0022
-int string hello_world 0x7f0d0023
-int string loading 0x7f0d0024
-int string loginbutton 0x7f0d0025
-int string loginpassword 0x7f0d0026
-int string loginusername 0x7f0d0027
-int string marked 0x7f0d0028
-int string menu_search 0x7f0d0029
-int string modified 0x7f0d002a
-int string navigation_drawer_close 0x7f0d002b
-int string navigation_drawer_open 0x7f0d002c
-int string play_workflow 0x7f0d002d
-int string search_hint 0x7f0d002e
-int string seemore 0x7f0d002f
-int string title_about 0x7f0d0030
-int string title_activity_dashboard_main 0x7f0d0031
-int string title_activity_flash_screen 0x7f0d0032
-int string title_activity_workflow_detail 0x7f0d0033
-int string title_exit 0x7f0d0034
-int string title_explore 0x7f0d0035
-int string title_favorite 0x7f0d0036
-int string title_openworkflow 0x7f0d0037
-int string title_usage 0x7f0d0038
-int string wktitle 0x7f0d0039
-int string workflow_authorhint 0x7f0d003a
-int string workflow_component 0x7f0d003b
-int string workflow_download 0x7f0d003c
-int string workflow_empty 0x7f0d003d
-int string workflow_mark 0x7f0d003e
-int string workflow_read 0x7f0d003f
+int string emailerr 0x7f0d0021
+int string favorite_empty 0x7f0d0022
+int string fetchrun 0x7f0d0023
+int string hello_blank_fragment 0x7f0d0024
+int string hello_world 0x7f0d0025
+int string keeplogin 0x7f0d0026
+int string loading 0x7f0d0027
+int string loadworkflows 0x7f0d0028
+int string loginbutton 0x7f0d0029
+int string loginpassword 0x7f0d002a
+int string loginusername 0x7f0d002b
+int string marked 0x7f0d002c
+int string menu_search 0x7f0d002d
+int string modified 0x7f0d002e
+int string navigation_drawer_close 0x7f0d002f
+int string navigation_drawer_open 0x7f0d0030
+int string passworderr 0x7f0d0031
+int string play_workflow 0x7f0d0032
+int string pref_header_general 0x7f0d0033
+int string pref_login_description 0x7f0d0034
+int string pref_player_default 0x7f0d0035
+int string pref_player_des 0x7f0d0036
+int string pref_player_title 0x7f0d0037
+int string pref_remainLogged_in 0x7f0d0038
+int string pref_server_default 0x7f0d0039
+int string pref_server_des 0x7f0d003a
+int string pref_server_title 0x7f0d003b
+int string search_hint 0x7f0d003c
+int string seemore 0x7f0d003d
+int string title_about 0x7f0d003e
+int string title_activity_dashboard_main 0x7f0d003f
+int string title_activity_flash_screen 0x7f0d0040
+int string title_activity_settings 0x7f0d0041
+int string title_activity_workflow_detail 0x7f0d0042
+int string title_exit 0x7f0d0043
+int string title_explore 0x7f0d0044
+int string title_favorite 0x7f0d0045
+int string title_openworkflow 0x7f0d0046
+int string title_usage 0x7f0d0047
+int string wktitle 0x7f0d0048
+int string workflow_authorhint 0x7f0d0049
+int string workflow_component 0x7f0d004a
+int string workflow_download 0x7f0d004b
+int string workflow_empty 0x7f0d004c
+int string workflow_mark 0x7f0d004d
+int string workflow_read 0x7f0d004e
int style Animation_AppCompat_DropDownUp 0x7f0e0000
int style AppTheme 0x7f0e0001
int style Base_Animation_AppCompat_DropDownUp 0x7f0e0002
@@ -1172,4 +1190,6 @@ int[] styleable ViewStubCompat { 0x010100d0, 0x010100f2, 0x010100f3 }
int styleable ViewStubCompat_android_id 0
int styleable ViewStubCompat_android_inflatedId 2
int styleable ViewStubCompat_android_layout 1
-int xml searchable 0x7f060000
+int xml pref_general 0x7f060000
+int xml pref_headers 0x7f060001
+int xml searchable 0x7f060002
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/05a2c718/app/build/outputs/apk/app-debug-unaligned.apk
----------------------------------------------------------------------
diff --git a/app/build/outputs/apk/app-debug-unaligned.apk b/app/build/outputs/apk/app-debug-unaligned.apk
index 99cb290..d0ae36e 100644
Binary files a/app/build/outputs/apk/app-debug-unaligned.apk and b/app/build/outputs/apk/app-debug-unaligned.apk differ
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/05a2c718/app/build/outputs/apk/app-debug.apk
----------------------------------------------------------------------
diff --git a/app/build/outputs/apk/app-debug.apk b/app/build/outputs/apk/app-debug.apk
index d548086..5d1bb5d 100644
Binary files a/app/build/outputs/apk/app-debug.apk and b/app/build/outputs/apk/app-debug.apk differ
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/05a2c718/app/build/outputs/logs/manifest-merger-debug-report.txt
----------------------------------------------------------------------
diff --git a/app/build/outputs/logs/manifest-merger-debug-report.txt b/app/build/outputs/logs/manifest-merger-debug-report.txt
index 61404eb..714baf8 100644
--- a/app/build/outputs/logs/manifest-merger-debug-report.txt
+++ b/app/build/outputs/logs/manifest-merger-debug-report.txt
@@ -28,6 +28,7 @@ MERGED from com.android.support:support-v4:22.0.0:22:5
MERGED from com.android.support:cardview-v7:22.0.0:22:5
MERGED from com.android.support:recyclerview-v7:22.0.0:22:5
MERGED from com.android.support:support-v4:22.0.0:22:5
+MERGED from com.android.support:support-v4:22.0.0:22:5
android:label
ADDED from AndroidManifest.xml:30:9
android:allowBackup
@@ -100,12 +101,18 @@ ADDED from AndroidManifest.xml:65:9
ADDED from AndroidManifest.xml:66:13
intent-filter#android.intent.action.DOWNLOAD_COMPLETE
ADDED from AndroidManifest.xml:69:13
- android:priority
- ADDED from AndroidManifest.xml:70:17
action#android.intent.action.DOWNLOAD_COMPLETE
-ADDED from AndroidManifest.xml:71:17
+ADDED from AndroidManifest.xml:70:17
android:name
- ADDED from AndroidManifest.xml:71:25
+ ADDED from AndroidManifest.xml:70:25
+activity#org.apache.taverna.mobile.activities.SettingsActivity
+ADDED from AndroidManifest.xml:74:9
+ android:label
+ ADDED from AndroidManifest.xml:76:13
+ android:parentActivityName
+ ADDED from AndroidManifest.xml:77:13
+ android:name
+ ADDED from AndroidManifest.xml:75:13
uses-sdk
INJECTED from AndroidManifest.xml:0:0 reason: use-sdk injection requested
MERGED from com.android.support:appcompat-v7:22.0.0:20:5
@@ -113,6 +120,7 @@ MERGED from com.android.support:support-v4:22.0.0:20:5
MERGED from com.android.support:cardview-v7:22.0.0:20:5
MERGED from com.android.support:recyclerview-v7:22.0.0:20:5
MERGED from com.android.support:support-v4:22.0.0:20:5
+MERGED from com.android.support:support-v4:22.0.0:20:5
android:targetSdkVersion
INJECTED from AndroidManifest.xml:0:0
INJECTED from AndroidManifest.xml:0:0
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/05a2c718/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 7624082..65ad26f 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
@@ -25,7 +25,6 @@ package org.apache.taverna.mobile.activities;
* under the License.
*/
-import android.app.SearchManager;
import android.content.Context;
import android.content.Intent;
import android.content.SharedPreferences;
@@ -41,11 +40,9 @@ import android.support.v4.view.ViewPager;
import android.support.v4.widget.DrawerLayout;
import android.support.v7.app.ActionBar;
import android.support.v7.app.ActionBarActivity;
-import android.support.v7.widget.SearchView;
import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
-import android.view.Window;
import android.widget.Toast;
import org.apache.taverna.mobile.R;
@@ -77,7 +74,6 @@ public class DashboardMainActivity extends ActionBarActivity
@Override
protected void onCreate(Bundle savedInstanceState) {
- requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_dashboard_main);
setUpWorkflowDirectory(this);
@@ -96,13 +92,13 @@ public class DashboardMainActivity extends ActionBarActivity
mPager = (ViewPager)findViewById(R.id.pager);
mPager.setAdapter(mAdapter);
- //Handle search actions from a system sent intent
+ /* //Handle search actions from a system sent intent
Intent searchIntent = getIntent();
if(searchIntent != null && Intent.ACTION_SEARCH.equals(searchIntent.getAction())){
//retrieve and process query then display results
String query = searchIntent.getStringExtra(SearchManager.QUERY);
Toast.makeText(this,"Query = "+query, Toast.LENGTH_SHORT).show();
- }
+ }*/
}
@Override
@@ -239,13 +235,13 @@ public class DashboardMainActivity extends ActionBarActivity
// decide what to show in the action bar.
MenuInflater mi = getMenuInflater();
mi.inflate(R.menu.dashboard_main, menu);
- //get the searchview and set the searchable configuration
+ /* //get the searchview and set the searchable configuration
SearchManager searchManager = (SearchManager) getSystemService(Context.SEARCH_SERVICE);
SearchView searchView = (SearchView) menu.findItem(R.id.action_search).getActionView();
//assuming this activity is the searchable activity
searchView.setSearchableInfo(searchManager.getSearchableInfo(getComponentName()));
searchView.setSubmitButtonEnabled(true);
-// searchView.setIconifiedByDefault(false);
+// searchView.setIconifiedByDefault(false);*/
restoreActionBar();
return true;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/05a2c718/app/src/main/java/org/apache/taverna/mobile/activities/FlashScreenActivity.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/activities/FlashScreenActivity.java b/app/src/main/java/org/apache/taverna/mobile/activities/FlashScreenActivity.java
index db03d01..c346fc4 100644
--- a/app/src/main/java/org/apache/taverna/mobile/activities/FlashScreenActivity.java
+++ b/app/src/main/java/org/apache/taverna/mobile/activities/FlashScreenActivity.java
@@ -25,8 +25,10 @@ package org.apache.taverna.mobile.activities;
* under the License.
*/
+import android.content.Context;
import android.content.Intent;
import android.os.Handler;
+import android.preference.PreferenceManager;
import android.support.v7.app.ActionBarActivity;
import android.os.Bundle;
import android.view.Menu;
@@ -56,12 +58,25 @@ public class FlashScreenActivity extends ActionBarActivity {
@Override
public void onResume(){
super.onResume();
+ final Context context = this;
+ //setup initial app settings
+ if(!PreferenceManager.getDefaultSharedPreferences(context).getBoolean("pref_set", false)){
+ PreferenceManager.getDefaultSharedPreferences(context).edit().putString("pref_server_url", "http://heater.cs.man.ac.uk:8090/taverna-2.5.4/").commit();
+ PreferenceManager.getDefaultSharedPreferences(context).edit().putString("pref_player_url", "http://heater.cs.man.ac.uk:3000/").commit();
+ }else{
+ PreferenceManager.getDefaultSharedPreferences(context).edit().putBoolean("pref_set", true).commit();
+ }
Handler mhandler = new Handler();
mhandler.postDelayed(new Runnable() {
@Override
public void run() {
- startActivity(new Intent(FlashScreenActivity.this, LoginActivity.class));
- (FlashScreenActivity.this).finish();
+ if(!PreferenceManager.getDefaultSharedPreferences(context).getBoolean("pref_logged_in", false)) {
+ startActivity(new Intent(FlashScreenActivity.this, LoginActivity.class));
+ (FlashScreenActivity.this).finish();
+ }else{
+ startActivity(new Intent(FlashScreenActivity.this, DashboardMainActivity.class));
+ (FlashScreenActivity.this).finish();
+ }
}
}, 2500);
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/05a2c718/app/src/main/java/org/apache/taverna/mobile/activities/LoginActivity.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/activities/LoginActivity.java b/app/src/main/java/org/apache/taverna/mobile/activities/LoginActivity.java
index dea87b0..98ece01 100644
--- a/app/src/main/java/org/apache/taverna/mobile/activities/LoginActivity.java
+++ b/app/src/main/java/org/apache/taverna/mobile/activities/LoginActivity.java
@@ -25,18 +25,41 @@ package org.apache.taverna.mobile.activities;
* under the License.
*/
+import android.app.ProgressDialog;
+import android.content.Context;
import android.content.Intent;
+import android.os.AsyncTask;
+import android.preference.PreferenceManager;
import android.support.v7.app.ActionBarActivity;
import android.support.v4.app.Fragment;
import android.os.Bundle;
+import android.text.TextUtils;
+import android.util.Base64;
+import android.util.Log;
import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
import android.view.ViewGroup;
import android.widget.Button;
+import android.widget.CheckBox;
+import android.widget.EditText;
+import android.widget.Toast;
import org.apache.taverna.mobile.R;
+import org.apache.taverna.mobile.tavernamobile.TavernaPlayerAPI;
+import org.apache.taverna.mobile.tavernamobile.Workflow;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.Authenticator;
+import java.net.HttpURLConnection;
+import java.net.URL;
public class LoginActivity extends ActionBarActivity {
@@ -69,6 +92,10 @@ public class LoginActivity extends ActionBarActivity {
public static class LoginFragment extends Fragment implements View.OnClickListener{
private View rootView;
+ private Button loginButton;
+ private EditText email, password;
+ private boolean logginRemain;
+ private CheckBox loginCheck;
public LoginFragment() {
}
@@ -77,19 +104,104 @@ public class LoginActivity extends ActionBarActivity {
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
rootView = inflater.inflate(R.layout.fragment_login, container, false);
- Button loginButton = (Button) rootView.findViewById(R.id.loginbutton);
+ email = (EditText) rootView.findViewById(R.id.editTextUsername);
+ password = (EditText) rootView.findViewById(R.id.edittextPassword);
+ loginCheck = (CheckBox) rootView.findViewById(R.id.rememberCheckbox);
+ loginButton = (Button) rootView.findViewById(R.id.loginbutton);
loginButton.setOnClickListener(this);
return rootView;
}
@Override
public void onClick(View view) {
- switch (view.getId()){
- case R.id.loginbutton:
- startActivity(new Intent(getActivity(), DashboardMainActivity.class));
- break;
+ int i = view.getId();
+ if (i == R.id.loginbutton) {
+ logginRemain = loginCheck.isChecked();
+ if (logginRemain) {
+ PreferenceManager.getDefaultSharedPreferences(getActivity()).edit().putBoolean("pref_logged_in",true).apply();
+ } else {
+ PreferenceManager.getDefaultSharedPreferences(getActivity()).edit().putBoolean("pref_logged_in",false).apply();
+ }
+ if (email.getText().toString().isEmpty()) {
+ email.setError(getString(R.string.emailerr));
+ } else if (password.getText().toString().isEmpty()) {
+ password.setError(getString(R.string.passworderr));
+ } else {
+ //send login request
+ new LoginTask(getActivity()).execute(email.getText().toString(), password.getText().toString());
+ }
+ //startActivity(new Intent(getActivity(), DashboardMainActivity.class));
+
+ }
+ }
+ private class LoginTask extends AsyncTask<String, Void, String>{
+ private Context context;
+ private ProgressDialog pd;
+
+ private LoginTask(Context context) {
+ this.context = context;
+ pd = new ProgressDialog(this.context);
+ pd.setMessage("Logging in");
+ }
+ @Override
+ protected void onPreExecute() {
+ super.onPreExecute();
+ pd.show();
+ }
+
+ @Override
+ protected String doInBackground(String... strings) {
+ //http://sandbox.myexperiment.org/users
+ try {
+ //for password protected urls use the user's credentials:new TavernaPlayerAPI(this.context).PLAYER_BASE_URL
+ Authenticator.setDefault(new TavernaPlayerAPI.Authenticator("taverna", "taverna"));
+
+ URL workflowurl = new URL(TavernaPlayerAPI.getSERVER_BASE_URL(this.context));
+ HttpURLConnection connection = (HttpURLConnection) workflowurl.openConnection();
+ String userpass = strings[0] + ":" + strings[1];
+ String basicAuth = "Basic " + Base64.encodeToString(userpass.getBytes(), Base64.DEFAULT);
+ //new String(Base64.encode(userpass.getBytes(),Base64.DEFAULT));
+
+ connection.setRequestProperty ("Authorization", basicAuth);
+ // connection.setRequestProperty("Accept", "application/json");
+ connection.setRequestMethod("GET");
+ // connection.setDoInput(true);
+ // connection.setDoOutput(true);
+ connection.connect(); //send request
+ int responseCode = connection.getResponseCode();
+ Log.i("RESPONSE Code", "" + responseCode);
+ Log.i("RESPONSE Messsage", ""+connection.getResponseMessage());
+ Log.i("Authorization ", ""+connection.getRequestProperty("Authorization"));
+
+ InputStream dis = connection.getInputStream();
+ BufferedReader br = new BufferedReader(new InputStreamReader(dis));
+ StringBuffer sb = new StringBuffer();
+ String jsonData = "";
+ while((jsonData = br.readLine()) != null){
+ sb.append(jsonData);
+ }
+ dis.close();
+ br.close();
+ return ""+responseCode;
+ } catch ( IOException e) {
+ e.printStackTrace();
+ }
+ return "0";
+ }
+
+ @Override
+ protected void onPostExecute(String s) {
+ Log.i("RESULTS", ""+s);
+ pd.dismiss();
+ if(TextUtils.isDigitsOnly(s) && Integer.parseInt(s) == 200) {
+ this.context.startActivity(new Intent(this.context, DashboardMainActivity.class));
+ getActivity().finish();
+ }else{
+ Toast.makeText(this.context, "Invalid username or password",Toast.LENGTH_SHORT).show();
+ }
}
}
}
+
}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/05a2c718/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 40e1dfa..cc55100 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
@@ -48,6 +48,7 @@ import org.apache.taverna.mobile.tavernamobile.Workflow;
import org.apache.taverna.mobile.utils.WorkflowDownloadManager;
import java.io.File;
+import java.util.ArrayList;
import java.util.List;
/**
@@ -63,6 +64,11 @@ public class WorkflowAdapter extends RecyclerView.Adapter<WorkflowAdapter.ViewHo
workflow = wk;
}
+ public WorkflowAdapter(Context c){
+ context = c;
+ workflow = new ArrayList<Workflow>();
+ }
+
@Override
public WorkflowAdapter.ViewHolder onCreateViewHolder(ViewGroup parentViewGroup, int viewType) {
View v = LayoutInflater.from(context).inflate(R.layout.workflow_item_layout,parentViewGroup,false);
@@ -155,6 +161,10 @@ public class WorkflowAdapter extends RecyclerView.Adapter<WorkflowAdapter.ViewHo
return workflow.get(position);
}
+ public void addWorkflow(Workflow wk){
+ workflow.add(wk);
+ }
+
@Override
public void onClick(View view) {
int i = view.getId();
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/05a2c718/app/src/main/java/org/apache/taverna/mobile/fragments/WorkflowItemFragment.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/fragments/WorkflowItemFragment.java b/app/src/main/java/org/apache/taverna/mobile/fragments/WorkflowItemFragment.java
index 49acbe5..a54565b 100644
--- a/app/src/main/java/org/apache/taverna/mobile/fragments/WorkflowItemFragment.java
+++ b/app/src/main/java/org/apache/taverna/mobile/fragments/WorkflowItemFragment.java
@@ -26,11 +26,15 @@ package org.apache.taverna.mobile.fragments;
import android.app.Activity;
import android.app.ProgressDialog;
+import android.app.SearchManager;
+import android.content.Context;
+import android.content.Intent;
import android.os.Bundle;
import android.support.v4.app.Fragment;
import android.support.v4.widget.SwipeRefreshLayout;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
+import android.support.v7.widget.SearchView;
import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuInflater;
@@ -40,6 +44,7 @@ import android.view.ViewGroup;
import android.view.animation.Animation;
import android.view.animation.AnimationUtils;
import android.widget.TextView;
+import android.widget.Toast;
import org.apache.taverna.mobile.R;
import org.apache.taverna.mobile.activities.DashboardMainActivity;
@@ -113,10 +118,7 @@ public class WorkflowItemFragment extends Fragment implements android.app.Loader
List<Workflow> mlist = new ArrayList<Workflow>();
/* mlist.add(new Workflow(getActivity(),"Testing title","Larry","Ok testing",0,"http://127.0.0.1"));
mlist.add(new Workflow(getActivity(),"Testing title","Larry","Ok testing",0,"http://127.0.0.1"));
- /*
- mlist.add(new Workflow(getActivity(), null));
- mlist.add(new Workflow(getActivity(), null));
- mlist.add(new Workflow(getActivity(), null)); */
+*/
workflowAdapter = new WorkflowAdapter(getActivity(), mlist );
}
@@ -160,7 +162,15 @@ public class WorkflowItemFragment extends Fragment implements android.app.Loader
@Override
public void onResume() {
super.onResume();
- getActivity().getLoaderManager().initLoader(0,null,this);
+ //Handle search actions from a system sent intent
+ Intent searchIntent = getActivity().getIntent();
+ if(searchIntent != null && Intent.ACTION_SEARCH.equals(searchIntent.getAction())){
+ //retrieve and process query then display results
+ String query = searchIntent.getStringExtra(SearchManager.QUERY);
+ //Toast.makeText(getActivity(), "Query = " + query, Toast.LENGTH_SHORT).show();
+ performSearch(workflowAdapter,query);
+ }else
+ getActivity().getLoaderManager().initLoader(0,null,this);
}
/**
@@ -181,7 +191,13 @@ public class WorkflowItemFragment extends Fragment implements android.app.Loader
super.onCreateOptionsMenu(menu, inflater);
//menu.clear();
if(menu.size() == 1) {
- // inflater.inflate(R.menu.dashboard_main,menu);
+ //get the searchview and set the searchable configuration
+ SearchManager searchManager = (SearchManager) getActivity().getSystemService(Context.SEARCH_SERVICE);
+ SearchView searchView = (SearchView) menu.findItem(R.id.action_search).getActionView();
+ //assuming this activity is the searchable activity
+ searchView.setSearchableInfo(searchManager.getSearchableInfo(getActivity().getComponentName()));
+ searchView.setSubmitButtonEnabled(true);
+// searchView.setIconifiedByDefault(false);
MenuItem mit = menu.add("Refresh");
mit.setIcon(android.R.drawable.stat_notify_sync);
mit.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
@@ -232,6 +248,18 @@ public class WorkflowItemFragment extends Fragment implements android.app.Loader
}
}
+ private void performSearch(WorkflowAdapter adapter, String search){
+ WorkflowAdapter ladapter = new WorkflowAdapter(getActivity());
+
+ for(int i=0; i<adapter.getItemCount(); i++) {
+ Workflow workflow = adapter.getItem(i);
+ if(search.contains(workflow.getWorkflow_author()) || search.contains(workflow.getWorkflow_title())){
+ ladapter.addWorkflow(workflow);
+ }
+ }
+ mListView.swapAdapter(ladapter, true);
+ }
+
/**
* Instantiate and return a new Loader for the given ID.
*
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/05a2c718/app/src/main/java/org/apache/taverna/mobile/tavernamobile/TavernaPlayerAPI.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/tavernamobile/TavernaPlayerAPI.java b/app/src/main/java/org/apache/taverna/mobile/tavernamobile/TavernaPlayerAPI.java
index 9697fb8..388dc2d 100644
--- a/app/src/main/java/org/apache/taverna/mobile/tavernamobile/TavernaPlayerAPI.java
+++ b/app/src/main/java/org/apache/taverna/mobile/tavernamobile/TavernaPlayerAPI.java
@@ -27,23 +27,28 @@ public class TavernaPlayerAPI {
PLAYER_RUN_FRAMEWORK_URL = PLAYER_RUN_URL+"new?workflow_id=";
}
- public static String getPLAYER_BASE_URL() {
+ public static String getPLAYER_BASE_URL(Context context) {
+ new TavernaPlayerAPI(context);
return PLAYER_BASE_URL;
}
- public static String getSERVER_BASE_URL() {
+ public static String getSERVER_BASE_URL(Context ctx) {
+ new TavernaPlayerAPI(ctx);
return SERVER_BASE_URL;
}
- public static String getPLAYER_WORKFLOW_URL() {
+ public static String getPLAYER_WORKFLOW_URL(Context ctx) {
+ new TavernaPlayerAPI(ctx);
return PLAYER_WORKFLOW_URL;
}
- public static String getPLAYER_RUN_URL() {
+ public static String getPLAYER_RUN_URL(Context ctx) {
+ new TavernaPlayerAPI(ctx);
return PLAYER_RUN_URL;
}
- public static String getPLAYER_RUN_FRAMEWORK_URL() {
+ public static String getPLAYER_RUN_FRAMEWORK_URL(Context ctx) {
+ new TavernaPlayerAPI(ctx);
return PLAYER_RUN_FRAMEWORK_URL;
}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/05a2c718/app/src/main/res/layout/fragment_login.xml
----------------------------------------------------------------------
diff --git a/app/src/main/res/layout/fragment_login.xml b/app/src/main/res/layout/fragment_login.xml
index b1206c3..ad52491 100644
--- a/app/src/main/res/layout/fragment_login.xml
+++ b/app/src/main/res/layout/fragment_login.xml
@@ -110,6 +110,12 @@ limitations under the License.
android:drawableStart="@android:drawable/ic_secure"
android:drawableLeft="@android:drawable/ic_secure"/>
+ <CheckBox
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/keeplogin"
+ android:id="@+id/rememberCheckbox" />
+
<Button
android:layout_width="wrap_content"
android:layout_height="wrap_content"
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/05a2c718/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 e9ac67c..f270b63 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -80,5 +80,9 @@ limitations under the License.
<string name="loading">Loading details</string>
<string name="loadworkflows">Loading Workflows</string>
<string name="fetchrun">Fetching run components </string>
+ <string name="keeplogin">Remain Logged-in</string>
+
+ <string name="emailerr">Email must not be empty</string>
+ <string name="passworderr">Password must not be empty</string>
</resources>