Merge branch 'ian_licence_dialog_web_view'
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/a0033e70 Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/a0033e70 Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/a0033e70 Branch: refs/heads/master Commit: a0033e70b24ccf9546dec55d1948bc1ff5dfe0e0 Parents: 990eb0d e486eab Author: Sagar <[email protected]> Authored: Thu Nov 3 21:41:56 2016 +0530 Committer: Sagar <[email protected]> Committed: Thu Nov 3 21:41:56 2016 +0530 ---------------------------------------------------------------------- app/src/main/assets/licences.html | 334 +++++++++++++++++++ app/src/main/assets/licences.json | 132 -------- .../data/model/licence/LicenceContent.java | 28 -- .../taverna/mobile/ui/DashboardActivity.java | 42 ++- .../ui/adapter/LicenceRecyclerViewAdapter.java | 88 ----- .../mobile/ui/licence/LicenceFragment.java | 105 ------ app/src/main/res/layout/fragment_licence.xml | 83 +---- app/src/main/res/values/styles.xml | 2 + 8 files changed, 368 insertions(+), 446 deletions(-) ----------------------------------------------------------------------
