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/29 12:08:52 UTC
[42/46] incubator-taverna-mobile git commit: Fixed workflow search
function
Fixed workflow search function
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/8cd01137
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/8cd01137
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/8cd01137
Branch: refs/heads/master
Commit: 8cd011371e6b382370a0fa063ccb9ac44f0187e4
Parents: 54bd875
Author: larrytech7 <la...@gmail.com>
Authored: Fri Jun 26 02:29:22 2015 +0100
Committer: larrytech7 <la...@gmail.com>
Committed: Fri Jun 26 02:29:22 2015 +0100
----------------------------------------------------------------------
.../apache/taverna/mobile/fragments/WorkflowItemFragment.java | 6 +++---
app/src/main/res/layout/workflow_item_layout.xml | 6 ++++--
app/src/main/res/values/strings.xml | 2 +-
3 files changed, 8 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/8cd01137/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 0fbdbfb..9f0a8e6 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
@@ -221,17 +221,17 @@ public class WorkflowItemFragment extends Fragment implements SwipeRefreshLayout
//handle a request to query for given workflows
private void performSearch(String search){
WorkflowAdapter ladapter = new WorkflowAdapter(getActivity());
- WorkflowAdapter wk = (WorkflowAdapter) mListView.getAdapter();//workflowAdapter;
+ WorkflowAdapter wk = searchAdpater;//workflowAdapter;
if(null != wk)
for(int i=0; i< wk.getItemCount(); i++) {
Workflow workflow = wk.getItem(i);
- if( search.contains(workflow.getWorkflow_title().toLowerCase())){
+ if( workflow.getWorkflow_title().toLowerCase().contains(search.toLowerCase())){
ladapter.addWorkflow(workflow);
}
}
else{
- Toast.makeText(getActivity(),"No workflows found matching criteria", Toast.LENGTH_SHORT).show();
+ Toast.makeText(getActivity(),"No workflows available", Toast.LENGTH_SHORT).show();
}
mListView.swapAdapter(ladapter, true);
if(ladapter.getItemCount()==0)
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/8cd01137/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 da42247..26b30f6 100644
--- a/app/src/main/res/layout/workflow_item_layout.xml
+++ b/app/src/main/res/layout/workflow_item_layout.xml
@@ -122,10 +122,12 @@ limitations under the License.
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:src="@drawable/tavernalogo"
- android:contentDescription="@string/workflow_component" />
+ android:contentDescription="@string/workflow_component"
+ android:visibility="gone" />
<LinearLayout
android:layout_width="match_parent"
- android:layout_height="wrap_content">
+ android:layout_height="wrap_content"
+ android:layout_margin="10dp">
<Button
android:id="@+id/button_view_workflow"
android:layout_width="wrap_content"
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/8cd01137/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 7520cfd..1107796 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -77,7 +77,7 @@ limitations under the License.
<string name="downloaderror">Unable to start Download. Check your internet connectivity</string>
<string name="downloadduplicate">Already Downloading</string>
<string name="downloadcomplete"> download complete</string>
- <string name="seemore"> See more &raquo</string>
+ <string name="seemore"> More Info &raquo</string>
<string name="loading">Loading details</string>
<string name="loadworkflows">Loading Workflows</string>
<string name="fetchrun">Fetching run components </string>