Added favorite status now shown in workflow list. There is still an issue with some workflows being illegally marked
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/73107d01 Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/73107d01 Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/73107d01 Branch: refs/heads/master Commit: 73107d018f02517186b4f5486d2921f13f5a48fc Parents: d53ae4d Author: larrytech7 <larrya...@gmail.com> Authored: Tue Aug 4 02:29:11 2015 +0100 Committer: larrytech7 <larrya...@gmail.com> Committed: Tue Aug 4 02:29:11 2015 +0100 ---------------------------------------------------------------------- .../taverna/mobile/adapters/WorkflowAdapter.java | 18 ++++++++++-------- .../mobile/fragments/FavoriteFragment.java | 3 ++- 2 files changed, 12 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/73107d01/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 d0468b0..0694086 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 @@ -125,7 +125,7 @@ public class WorkflowAdapter extends RecyclerView.Adapter<WorkflowAdapter.ViewHo WorkflowdetailFragment.WORKFLO_ID = title;//workflow.get(i).getId(); //determine whether to mark button as favorited or not - String favs = PreferenceManager.getDefaultSharedPreferences(context).getString(FAVORITE_LIST_DB, ""); + final String favs = PreferenceManager.getDefaultSharedPreferences(context).getString(FAVORITE_LIST_DB, ""); String[] ids = favs.split(","); if(ids.length > 0) { for (String id : ids) @@ -156,16 +156,18 @@ public class WorkflowAdapter extends RecyclerView.Adapter<WorkflowAdapter.ViewHo int saved = favDB.insert(mfav); if(saved >0) { - Toast.makeText(context, "Workflow marked as favorite", Toast.LENGTH_SHORT).show(); viewHolder.btn_mark_workflow.setBackgroundResource(R.drawable.abc_list_selector_disabled_holo_light); - PreferenceManager.getDefaultSharedPreferences(context).edit().putString(FAVORITE_LIST_DB, wid+",").apply(); + PreferenceManager.getDefaultSharedPreferences(context).edit().putString(FAVORITE_LIST_DB, favs+wid+",").apply(); //refresh fragment since data has changed - try { - ((RecyclerView) ((Activity) context).findViewById(R.id.favoriteList)).getAdapter().notifyDataSetChanged(); - }catch(NullPointerException np){ - np.printStackTrace(); - } + FavoriteWorkflowAdapter favoriteWorkflowAdapter = (FavoriteWorkflowAdapter) ((RecyclerView) ((Activity) context).findViewById(R.id.favoriteList)).getAdapter(); + //try { + if(null != favoriteWorkflowAdapter) + favoriteWorkflowAdapter.notifyDataSetChanged(); + //}catch(NullPointerException np){ + // np.printStackTrace(); + // } + Toast.makeText(context, "Workflow marked as favorite", Toast.LENGTH_SHORT).show(); }else if(saved == -1){ Toast.makeText(context,"sorry!, this workflow has already been marked as favorite",Toast.LENGTH_SHORT).show(); }else http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/73107d01/app/src/main/java/org/apache/taverna/mobile/fragments/FavoriteFragment.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/taverna/mobile/fragments/FavoriteFragment.java b/app/src/main/java/org/apache/taverna/mobile/fragments/FavoriteFragment.java index 4efa332..f200d32 100644 --- a/app/src/main/java/org/apache/taverna/mobile/fragments/FavoriteFragment.java +++ b/app/src/main/java/org/apache/taverna/mobile/fragments/FavoriteFragment.java @@ -91,6 +91,7 @@ public class FavoriteFragment extends Fragment implements RecyclerView.OnCreateC }; setUpFavoriteData(); + } @Override @@ -101,7 +102,6 @@ public class FavoriteFragment extends Fragment implements RecyclerView.OnCreateC wFavoriteListView.setHasFixedSize(true); wFavoriteListView.setLayoutManager(new LinearLayoutManager(getActivity())); wFavoriteListView.setAdapter(favoriteAdapter); - return rootView; } @@ -196,6 +196,7 @@ public class FavoriteFragment extends Fragment implements RecyclerView.OnCreateC @Override public void onResume() { super.onResume(); + // setUpListView(); //wFavoriteListView.setOnCreateContextMenuListener(this); //registerForContextMenu(wFavoriteListView);
