You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@taverna.apache.org by ia...@apache.org on 2016/10/14 14:09:35 UTC
[5/5] incubator-taverna-mobile git commit: This closes #32. Changed
package name for licences and load them from json asset
This closes #32. Changed package name for licences and load them from json asset
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/37fdd723
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/37fdd723
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/37fdd723
Branch: refs/heads/master
Commit: 37fdd723361d78be581ae0fd10efa899e351584d
Parents: 908d910
Author: Ian Dunlop <ia...@manchester.ac.uk>
Authored: Fri Oct 14 15:05:18 2016 +0100
Committer: Ian Dunlop <ia...@manchester.ac.uk>
Committed: Fri Oct 14 15:06:52 2016 +0100
----------------------------------------------------------------------
.../activities/DashboardMainActivity.java | 2 +-
.../data/model/licence/LicenceContent.java | 1 -
.../mobile/ui/licence/LicenceFragment.java | 30 ++++++++++++++++----
3 files changed, 26 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/37fdd723/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 e500b4f..be3b2a6 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
@@ -55,7 +55,7 @@ import org.apache.taverna.mobile.data.DataManager;
import org.apache.taverna.mobile.data.local.PreferencesHelper;
import org.apache.taverna.mobile.ui.anouncements.AnnouncementFragment;
import org.apache.taverna.mobile.ui.favouriteworkflow.FavouriteWorkflowsFragment;
-import org.apache.taverna.mobile.ui.licences.LicenceFragment;
+import org.apache.taverna.mobile.ui.licence.LicenceFragment;
import org.apache.taverna.mobile.ui.myworkflows.MyWorkflowFragment;
import org.apache.taverna.mobile.ui.workflow.WorkflowFragment;
import org.apache.taverna.mobile.utils.ActivityUtils;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/37fdd723/app/src/main/java/org/apache/taverna/mobile/data/model/licence/LicenceContent.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/data/model/licence/LicenceContent.java b/app/src/main/java/org/apache/taverna/mobile/data/model/licence/LicenceContent.java
index fdf346c..a3e93ba 100644
--- a/app/src/main/java/org/apache/taverna/mobile/data/model/licence/LicenceContent.java
+++ b/app/src/main/java/org/apache/taverna/mobile/data/model/licence/LicenceContent.java
@@ -5,7 +5,6 @@ import com.google.gson.annotations.SerializedName;
public class LicenceContent {
- @SerializedName("library_name")
private String name;
private String version;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/37fdd723/app/src/main/java/org/apache/taverna/mobile/ui/licence/LicenceFragment.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/licence/LicenceFragment.java b/app/src/main/java/org/apache/taverna/mobile/ui/licence/LicenceFragment.java
index 1bbe411..e8cc856 100644
--- a/app/src/main/java/org/apache/taverna/mobile/ui/licence/LicenceFragment.java
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/licence/LicenceFragment.java
@@ -35,6 +35,8 @@ import org.apache.taverna.mobile.R;
import org.apache.taverna.mobile.data.model.licence.LicenceContent;
import org.apache.taverna.mobile.ui.adapter.LicenceRecyclerViewAdapter;
+import java.io.IOException;
+import java.io.InputStream;
import java.lang.reflect.Type;
import java.util.List;
@@ -44,7 +46,7 @@ import java.util.List;
public class LicenceFragment extends Fragment {
- private List<LicenceContent> itemList;
+ //private List<LicenceContent> itemList;
private Gson gson;
@@ -74,12 +76,30 @@ public class LicenceFragment extends Fragment {
Context context = view.getContext();
RecyclerView recyclerView = (RecyclerView) view;
recyclerView.setLayoutManager(new LinearLayoutManager(context));
- Type type = new TypeToken<List<org.apache.taverna.mobile.data.model.>>() {
- }.getType();
- itemList = gson.fromJson(getString(R.string.licence_data), type);
- recyclerView.setAdapter(new LicenceRecyclerViewAdapter(itemList));
+ recyclerView.setAdapter(new LicenceRecyclerViewAdapter(loadJSONFromAsset()));
}
}
+ private List<LicenceContent> loadJSONFromAsset() {
+ String json = null;
+ List<LicenceContent> itemList = null;
+ try {
+ InputStream is = getActivity().getAssets().open("licences.json");
+ int size = is.available();
+ byte[] buffer = new byte[size];
+ is.read(buffer);
+ is.close();
+ json = new String(buffer, "UTF-8");
+ } catch (IOException ex) {
+ ex.printStackTrace();
+ return null;
+ }
+ Type type = new TypeToken<List<LicenceContent>>() {
+ }.getType();
+ itemList = gson.fromJson(json, type);
+
+ return itemList;
+ }
+
}