http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/54bd8752/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 deleted file mode 100644 index 7f33f8a..0000000 --- a/app/build/outputs/logs/manifest-merger-debug-report.txt +++ /dev/null @@ -1,137 +0,0 @@ --- Merging decision tree log --- -manifest -ADDED from AndroidManifest.xml:21:1 - package - ADDED from AndroidManifest.xml:22:5 - INJECTED from AndroidManifest.xml:0:0 - INJECTED from AndroidManifest.xml:0:0 - android:versionName - INJECTED from AndroidManifest.xml:0:0 - INJECTED from AndroidManifest.xml:0:0 - xmlns:android - ADDED from AndroidManifest.xml:21:11 - android:versionCode - INJECTED from AndroidManifest.xml:0:0 - INJECTED from AndroidManifest.xml:0:0 -uses-permission#android.permission.INTERNET -ADDED from AndroidManifest.xml:24:5 - android:name - ADDED from AndroidManifest.xml:24:22 -uses-permission#android.permission.WRITE_EXTERNAL_STORAGE -ADDED from AndroidManifest.xml:25:5 - android:name - ADDED from AndroidManifest.xml:25:22 -application -ADDED from AndroidManifest.xml:27:5 -MERGED from com.android.support:appcompat-v7:22.0.0:22:5 -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 - ADDED from AndroidManifest.xml:28:9 - android:icon - ADDED from AndroidManifest.xml:29:9 - android:theme - ADDED from AndroidManifest.xml:31:9 -activity#org.apache.taverna.mobile.activities.LoginActivity -ADDED from AndroidManifest.xml:32:9 - android:label - ADDED from AndroidManifest.xml:34:13 - android:name - ADDED from AndroidManifest.xml:33:13 -activity#org.apache.taverna.mobile.activities.FlashScreenActivity -ADDED from AndroidManifest.xml:36:9 - android:label - ADDED from AndroidManifest.xml:38:13 - android:name - ADDED from AndroidManifest.xml:37:13 -intent-filter#android.intent.action.MAIN+android.intent.category.LAUNCHER -ADDED from AndroidManifest.xml:39:13 -action#android.intent.action.MAIN -ADDED from AndroidManifest.xml:40:17 - android:name - ADDED from AndroidManifest.xml:40:25 -category#android.intent.category.LAUNCHER -ADDED from AndroidManifest.xml:42:17 - android:name - ADDED from AndroidManifest.xml:42:27 -activity#org.apache.taverna.mobile.activities.DashboardMainActivity -ADDED from AndroidManifest.xml:45:9 - android:label - ADDED from AndroidManifest.xml:47:13 - android:launchMode - ADDED from AndroidManifest.xml:48:13 - android:name - ADDED from AndroidManifest.xml:46:13 -intent-filter#android.intent.action.SEARCH -ADDED from AndroidManifest.xml:49:13 -action#android.intent.action.SEARCH -ADDED from AndroidManifest.xml:50:17 - android:name - ADDED from AndroidManifest.xml:50:25 -meta-data#android.app.searchable -ADDED from AndroidManifest.xml:53:13 - android:resource - ADDED from AndroidManifest.xml:55:17 - android:name - ADDED from AndroidManifest.xml:54:17 -activity#org.apache.taverna.mobile.activities.WorkflowDetailActivity -ADDED from AndroidManifest.xml:57:9 - android:label - ADDED from AndroidManifest.xml:59:13 - android:parentActivityName - ADDED from AndroidManifest.xml:60:13 - android:name - ADDED from AndroidManifest.xml:58:13 -meta-data#android.support.PARENT_ACTIVITY -ADDED from AndroidManifest.xml:61:13 - android:value - ADDED from AndroidManifest.xml:63:17 - android:name - ADDED from AndroidManifest.xml:62:17 -receiver#org.apache.taverna.mobile.broadcastreceivers.WorkflowDownloadReceiver -ADDED from AndroidManifest.xml:66:9 - android:enabled - ADDED from AndroidManifest.xml:68:13 - android:exported - ADDED from AndroidManifest.xml:69:13 - android:name - ADDED from AndroidManifest.xml:67:13 -intent-filter#android.intent.action.DOWNLOAD_COMPLETE -ADDED from AndroidManifest.xml:70:13 -action#android.intent.action.DOWNLOAD_COMPLETE -ADDED from AndroidManifest.xml:71:17 - android:name - ADDED from AndroidManifest.xml:71:25 -activity#org.apache.taverna.mobile.activities.SettingsActivity -ADDED from AndroidManifest.xml:75:9 - android:label - ADDED from AndroidManifest.xml:77:13 - android:parentActivityName - ADDED from AndroidManifest.xml:78:13 - android:name - ADDED from AndroidManifest.xml:76: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 -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 - android:minSdkVersion - INJECTED from AndroidManifest.xml:0:0 - INJECTED from AndroidManifest.xml:0:0 -activity#android.support.v7.widget.TestActivity -ADDED from com.android.support:recyclerview-v7:22.0.0:23:9 - android:label - ADDED from com.android.support:recyclerview-v7:22.0.0:25:13 - android:name - ADDED from com.android.support:recyclerview-v7:22.0.0:24:13
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/54bd8752/app/build/outputs/logs/manifest-merger-release-report.txt ---------------------------------------------------------------------- diff --git a/app/build/outputs/logs/manifest-merger-release-report.txt b/app/build/outputs/logs/manifest-merger-release-report.txt deleted file mode 100644 index 0188927..0000000 --- a/app/build/outputs/logs/manifest-merger-release-report.txt +++ /dev/null @@ -1,53 +0,0 @@ --- Merging decision tree log --- -manifest -ADDED from AndroidManifest.xml:22:1 - package - ADDED from AndroidManifest.xml:23:5 - INJECTED from AndroidManifest.xml:0:0 - INJECTED from AndroidManifest.xml:0:0 - android:versionName - INJECTED from AndroidManifest.xml:0:0 - INJECTED from AndroidManifest.xml:0:0 - xmlns:android - ADDED from AndroidManifest.xml:22:11 - android:versionCode - INJECTED from AndroidManifest.xml:0:0 - INJECTED from AndroidManifest.xml:0:0 -application -ADDED from AndroidManifest.xml:25:5 -MERGED from com.android.support:appcompat-v7:22.0.0:22:5 -MERGED from com.android.support:support-v4:22.0.0:22:5 - android:label - ADDED from AndroidManifest.xml:28:9 - android:allowBackup - ADDED from AndroidManifest.xml:26:9 - android:icon - ADDED from AndroidManifest.xml:27:9 - android:theme - ADDED from AndroidManifest.xml:29:9 -activity#mobile.taverna.apache.com.org.apache.taverna.mobile.LoginActivity -ADDED from AndroidManifest.xml:30:9 - android:label - ADDED from AndroidManifest.xml:32:13 - android:name - ADDED from AndroidManifest.xml:31:13 -intent-filter#android.intent.action.MAIN+android.intent.category.LAUNCHER -ADDED from AndroidManifest.xml:33:13 -action#android.intent.action.MAIN -ADDED from AndroidManifest.xml:34:17 - android:name - ADDED from AndroidManifest.xml:34:25 -category#android.intent.category.LAUNCHER -ADDED from AndroidManifest.xml:36:17 - android:name - ADDED from AndroidManifest.xml:36:27 -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 -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 - android:minSdkVersion - INJECTED from AndroidManifest.xml:0:0 - INJECTED from AndroidManifest.xml:0:0 http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/54bd8752/app/build/reports/tests/debug/css/base-style.css ---------------------------------------------------------------------- diff --git a/app/build/reports/tests/debug/css/base-style.css b/app/build/reports/tests/debug/css/base-style.css deleted file mode 100644 index 33e20f1..0000000 --- a/app/build/reports/tests/debug/css/base-style.css +++ /dev/null @@ -1,161 +0,0 @@ - -body { - margin: 0; - padding: 0; - font-family: sans-serif; - font-size: 12pt; -} - -body, a, a:visited { - color: #303030; -} - -#content { - padding-left: 50px; - padding-right: 50px; - padding-top: 30px; - padding-bottom: 30px; -} - -#content h1 { - font-size: 160%; - margin-bottom: 10px; -} - -#footer { - margin-top: 100px; - font-size: 80%; - white-space: nowrap; -} - -#footer, #footer a { - color: #a0a0a0; -} - -ul { - margin-left: 0; -} - -h1, h2, h3 { - white-space: nowrap; -} - -h2 { - font-size: 120%; -} - -ul.tabLinks { - padding-left: 0; - padding-top: 10px; - padding-bottom: 10px; - overflow: auto; - min-width: 800px; - width: auto !important; - width: 800px; -} - -ul.tabLinks li { - float: left; - height: 100%; - list-style: none; - padding-left: 10px; - padding-right: 10px; - padding-top: 5px; - padding-bottom: 5px; - margin-bottom: 0; - -moz-border-radius: 7px; - border-radius: 7px; - margin-right: 25px; - border: solid 1px #d4d4d4; - background-color: #f0f0f0; -} - -ul.tabLinks li:hover { - background-color: #fafafa; -} - -ul.tabLinks li.selected { - background-color: #c5f0f5; - border-color: #c5f0f5; -} - -ul.tabLinks a { - font-size: 120%; - display: block; - outline: none; - text-decoration: none; - margin: 0; - padding: 0; -} - -ul.tabLinks li h2 { - margin: 0; - padding: 0; -} - -div.tab { -} - -div.selected { - display: block; -} - -div.deselected { - display: none; -} - -div.tab table { - min-width: 350px; - width: auto !important; - width: 350px; - border-collapse: collapse; -} - -div.tab th, div.tab table { - border-bottom: solid #d0d0d0 1px; -} - -div.tab th { - text-align: left; - white-space: nowrap; - padding-left: 6em; -} - -div.tab th:first-child { - padding-left: 0; -} - -div.tab td { - white-space: nowrap; - padding-left: 6em; - padding-top: 5px; - padding-bottom: 5px; -} - -div.tab td:first-child { - padding-left: 0; -} - -div.tab td.numeric, div.tab th.numeric { - text-align: right; -} - -span.code { - display: inline-block; - margin-top: 0em; - margin-bottom: 1em; -} - -span.code pre { - font-size: 11pt; - padding-top: 10px; - padding-bottom: 10px; - padding-left: 10px; - padding-right: 10px; - margin: 0; - background-color: #f7f7f7; - border: solid 1px #d0d0d0; - min-width: 700px; - width: auto !important; - width: 700px; -} http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/54bd8752/app/build/reports/tests/debug/css/style.css ---------------------------------------------------------------------- diff --git a/app/build/reports/tests/debug/css/style.css b/app/build/reports/tests/debug/css/style.css deleted file mode 100644 index 3dc4913..0000000 --- a/app/build/reports/tests/debug/css/style.css +++ /dev/null @@ -1,84 +0,0 @@ - -#summary { - margin-top: 30px; - margin-bottom: 40px; -} - -#summary table { - border-collapse: collapse; -} - -#summary td { - vertical-align: top; -} - -.breadcrumbs, .breadcrumbs a { - color: #606060; -} - -.infoBox { - width: 110px; - padding-top: 15px; - padding-bottom: 15px; - text-align: center; -} - -.infoBox p { - margin: 0; -} - -.counter, .percent { - font-size: 120%; - font-weight: bold; - margin-bottom: 8px; -} - -#duration { - width: 125px; -} - -#successRate, .summaryGroup { - border: solid 2px #d0d0d0; - -moz-border-radius: 10px; - border-radius: 10px; -} - -#successRate { - width: 140px; - margin-left: 35px; -} - -#successRate .percent { - font-size: 180%; -} - -.success, .success a { - color: #008000; -} - -div.success, #successRate.success { - background-color: #bbd9bb; - border-color: #008000; -} - -.failures, .failures a { - color: #b60808; -} - -.skipped, .skipped a { - color: #c09853; -} - -div.failures, #successRate.failures { - background-color: #ecdada; - border-color: #b60808; -} - -ul.linkList { - padding-left: 0; -} - -ul.linkList li { - list-style: none; - margin-bottom: 5px; -} http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/54bd8752/app/build/reports/tests/debug/index.html ---------------------------------------------------------------------- diff --git a/app/build/reports/tests/debug/index.html b/app/build/reports/tests/debug/index.html deleted file mode 100644 index 503f735..0000000 --- a/app/build/reports/tests/debug/index.html +++ /dev/null @@ -1,86 +0,0 @@ -<!DOCTYPE html> -<html> -<head> -<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> -<meta http-equiv="x-ua-compatible" content="IE=edge"/> -<title>Test results - Test Summary</title> -<link href="css/base-style.css" rel="stylesheet" type="text/css"/> -<link href="css/style.css" rel="stylesheet" type="text/css"/> -<script src="js/report.js" type="text/javascript"></script> -</head> -<body> -<div id="content"> -<h1>Test Summary</h1> -<div id="summary"> -<table> -<tr> -<td> -<div class="summaryGroup"> -<table> -<tr> -<td> -<div class="infoBox" id="tests"> -<div class="counter">0</div> -<p>tests</p> -</div> -</td> -<td> -<div class="infoBox" id="failures"> -<div class="counter">0</div> -<p>failures</p> -</div> -</td> -<td> -<div class="infoBox" id="ignored"> -<div class="counter">0</div> -<p>ignored</p> -</div> -</td> -<td> -<div class="infoBox" id="duration"> -<div class="counter">-</div> -<p>duration</p> -</div> -</td> -</tr> -</table> -</div> -</td> -<td> -<div class="infoBox success" id="successRate"> -<div class="percent">-</div> -<p>successful</p> -</div> -</td> -</tr> -</table> -</div> -<div id="tabs"> -<ul class="tabLinks"> -<li> -<a href="#tab0">Classes</a> -</li> -</ul> -<div id="tab0" class="tab"> -<h2>Classes</h2> -<table> -<thead> -<tr> -<th>Class</th> -<th>Tests</th> -<th>Failures</th> -<th>Ignored</th> -<th>Duration</th> -<th>Success rate</th> -</tr> -</thead> -<tbody/> -</table> -</div> -</div> -<div id="footer"> -<p>Generated by -<a href="http://www.gradle.org">Gradle 2.2.1</a> at Jun 6, 2015 1:22:47 AM</p> -</div> -</div> -</body> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/54bd8752/app/build/reports/tests/debug/js/report.js ---------------------------------------------------------------------- diff --git a/app/build/reports/tests/debug/js/report.js b/app/build/reports/tests/debug/js/report.js deleted file mode 100644 index a4455e4..0000000 --- a/app/build/reports/tests/debug/js/report.js +++ /dev/null @@ -1,101 +0,0 @@ -var tabs = new Object(); - -function initTabs() { - var container = document.getElementById('tabs'); - tabs.tabs = findTabs(container); - tabs.titles = findTitles(tabs.tabs); - tabs.headers = findHeaders(container); - tabs.select = select; - tabs.deselectAll = deselectAll; - tabs.select(0); - return true; -} - -window.onload = initTabs; - -function switchTab() { - var id = this.id.substr(1); - for (var i = 0; i < tabs.tabs.length; i++) { - if (tabs.tabs[i].id == id) { - tabs.select(i); - break; - } - } - return false; -} - -function select(i) { - this.deselectAll(); - changeElementClass(this.tabs[i], 'tab selected'); - changeElementClass(this.headers[i], 'selected'); - while (this.headers[i].firstChild) { - this.headers[i].removeChild(this.headers[i].firstChild); - } - var h2 = document.createElement('H2'); - h2.appendChild(document.createTextNode(this.titles[i])); - this.headers[i].appendChild(h2); -} - -function deselectAll() { - for (var i = 0; i < this.tabs.length; i++) { - changeElementClass(this.tabs[i], 'tab deselected'); - changeElementClass(this.headers[i], 'deselected'); - while (this.headers[i].firstChild) { - this.headers[i].removeChild(this.headers[i].firstChild); - } - var a = document.createElement('A'); - a.setAttribute('id', 'ltab' + i); - a.setAttribute('href', '#tab' + i); - a.onclick = switchTab; - a.appendChild(document.createTextNode(this.titles[i])); - this.headers[i].appendChild(a); - } -} - -function changeElementClass(element, classValue) { - if (element.getAttribute('className')) { - /* IE */ - element.setAttribute('className', classValue) - } else { - element.setAttribute('class', classValue) - } -} - -function findTabs(container) { - return findChildElements(container, 'DIV', 'tab'); -} - -function findHeaders(container) { - var owner = findChildElements(container, 'UL', 'tabLinks'); - return findChildElements(owner[0], 'LI', null); -} - -function findTitles(tabs) { - var titles = new Array(); - for (var i = 0; i < tabs.length; i++) { - var tab = tabs[i]; - var header = findChildElements(tab, 'H2', null)[0]; - header.parentNode.removeChild(header); - if (header.innerText) { - titles.push(header.innerText) - } else { - titles.push(header.textContent) - } - } - return titles; -} - -function findChildElements(container, name, targetClass) { - var elements = new Array(); - var children = container.childNodes; - for (var i = 0; i < children.length; i++) { - var child = children.item(i); - if (child.nodeType == 1 && child.nodeName == name) { - if (targetClass && child.className.indexOf(targetClass) < 0) { - continue; - } - elements.push(child); - } - } - return elements; -} http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/54bd8752/app/build/reports/tests/release/css/base-style.css ---------------------------------------------------------------------- diff --git a/app/build/reports/tests/release/css/base-style.css b/app/build/reports/tests/release/css/base-style.css deleted file mode 100644 index 33e20f1..0000000 --- a/app/build/reports/tests/release/css/base-style.css +++ /dev/null @@ -1,161 +0,0 @@ - -body { - margin: 0; - padding: 0; - font-family: sans-serif; - font-size: 12pt; -} - -body, a, a:visited { - color: #303030; -} - -#content { - padding-left: 50px; - padding-right: 50px; - padding-top: 30px; - padding-bottom: 30px; -} - -#content h1 { - font-size: 160%; - margin-bottom: 10px; -} - -#footer { - margin-top: 100px; - font-size: 80%; - white-space: nowrap; -} - -#footer, #footer a { - color: #a0a0a0; -} - -ul { - margin-left: 0; -} - -h1, h2, h3 { - white-space: nowrap; -} - -h2 { - font-size: 120%; -} - -ul.tabLinks { - padding-left: 0; - padding-top: 10px; - padding-bottom: 10px; - overflow: auto; - min-width: 800px; - width: auto !important; - width: 800px; -} - -ul.tabLinks li { - float: left; - height: 100%; - list-style: none; - padding-left: 10px; - padding-right: 10px; - padding-top: 5px; - padding-bottom: 5px; - margin-bottom: 0; - -moz-border-radius: 7px; - border-radius: 7px; - margin-right: 25px; - border: solid 1px #d4d4d4; - background-color: #f0f0f0; -} - -ul.tabLinks li:hover { - background-color: #fafafa; -} - -ul.tabLinks li.selected { - background-color: #c5f0f5; - border-color: #c5f0f5; -} - -ul.tabLinks a { - font-size: 120%; - display: block; - outline: none; - text-decoration: none; - margin: 0; - padding: 0; -} - -ul.tabLinks li h2 { - margin: 0; - padding: 0; -} - -div.tab { -} - -div.selected { - display: block; -} - -div.deselected { - display: none; -} - -div.tab table { - min-width: 350px; - width: auto !important; - width: 350px; - border-collapse: collapse; -} - -div.tab th, div.tab table { - border-bottom: solid #d0d0d0 1px; -} - -div.tab th { - text-align: left; - white-space: nowrap; - padding-left: 6em; -} - -div.tab th:first-child { - padding-left: 0; -} - -div.tab td { - white-space: nowrap; - padding-left: 6em; - padding-top: 5px; - padding-bottom: 5px; -} - -div.tab td:first-child { - padding-left: 0; -} - -div.tab td.numeric, div.tab th.numeric { - text-align: right; -} - -span.code { - display: inline-block; - margin-top: 0em; - margin-bottom: 1em; -} - -span.code pre { - font-size: 11pt; - padding-top: 10px; - padding-bottom: 10px; - padding-left: 10px; - padding-right: 10px; - margin: 0; - background-color: #f7f7f7; - border: solid 1px #d0d0d0; - min-width: 700px; - width: auto !important; - width: 700px; -} http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/54bd8752/app/build/reports/tests/release/css/style.css ---------------------------------------------------------------------- diff --git a/app/build/reports/tests/release/css/style.css b/app/build/reports/tests/release/css/style.css deleted file mode 100644 index 3dc4913..0000000 --- a/app/build/reports/tests/release/css/style.css +++ /dev/null @@ -1,84 +0,0 @@ - -#summary { - margin-top: 30px; - margin-bottom: 40px; -} - -#summary table { - border-collapse: collapse; -} - -#summary td { - vertical-align: top; -} - -.breadcrumbs, .breadcrumbs a { - color: #606060; -} - -.infoBox { - width: 110px; - padding-top: 15px; - padding-bottom: 15px; - text-align: center; -} - -.infoBox p { - margin: 0; -} - -.counter, .percent { - font-size: 120%; - font-weight: bold; - margin-bottom: 8px; -} - -#duration { - width: 125px; -} - -#successRate, .summaryGroup { - border: solid 2px #d0d0d0; - -moz-border-radius: 10px; - border-radius: 10px; -} - -#successRate { - width: 140px; - margin-left: 35px; -} - -#successRate .percent { - font-size: 180%; -} - -.success, .success a { - color: #008000; -} - -div.success, #successRate.success { - background-color: #bbd9bb; - border-color: #008000; -} - -.failures, .failures a { - color: #b60808; -} - -.skipped, .skipped a { - color: #c09853; -} - -div.failures, #successRate.failures { - background-color: #ecdada; - border-color: #b60808; -} - -ul.linkList { - padding-left: 0; -} - -ul.linkList li { - list-style: none; - margin-bottom: 5px; -} http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/54bd8752/app/build/reports/tests/release/index.html ---------------------------------------------------------------------- diff --git a/app/build/reports/tests/release/index.html b/app/build/reports/tests/release/index.html deleted file mode 100644 index 503f735..0000000 --- a/app/build/reports/tests/release/index.html +++ /dev/null @@ -1,86 +0,0 @@ -<!DOCTYPE html> -<html> -<head> -<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> -<meta http-equiv="x-ua-compatible" content="IE=edge"/> -<title>Test results - Test Summary</title> -<link href="css/base-style.css" rel="stylesheet" type="text/css"/> -<link href="css/style.css" rel="stylesheet" type="text/css"/> -<script src="js/report.js" type="text/javascript"></script> -</head> -<body> -<div id="content"> -<h1>Test Summary</h1> -<div id="summary"> -<table> -<tr> -<td> -<div class="summaryGroup"> -<table> -<tr> -<td> -<div class="infoBox" id="tests"> -<div class="counter">0</div> -<p>tests</p> -</div> -</td> -<td> -<div class="infoBox" id="failures"> -<div class="counter">0</div> -<p>failures</p> -</div> -</td> -<td> -<div class="infoBox" id="ignored"> -<div class="counter">0</div> -<p>ignored</p> -</div> -</td> -<td> -<div class="infoBox" id="duration"> -<div class="counter">-</div> -<p>duration</p> -</div> -</td> -</tr> -</table> -</div> -</td> -<td> -<div class="infoBox success" id="successRate"> -<div class="percent">-</div> -<p>successful</p> -</div> -</td> -</tr> -</table> -</div> -<div id="tabs"> -<ul class="tabLinks"> -<li> -<a href="#tab0">Classes</a> -</li> -</ul> -<div id="tab0" class="tab"> -<h2>Classes</h2> -<table> -<thead> -<tr> -<th>Class</th> -<th>Tests</th> -<th>Failures</th> -<th>Ignored</th> -<th>Duration</th> -<th>Success rate</th> -</tr> -</thead> -<tbody/> -</table> -</div> -</div> -<div id="footer"> -<p>Generated by -<a href="http://www.gradle.org">Gradle 2.2.1</a> at Jun 6, 2015 1:22:47 AM</p> -</div> -</div> -</body> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/54bd8752/app/build/reports/tests/release/js/report.js ---------------------------------------------------------------------- diff --git a/app/build/reports/tests/release/js/report.js b/app/build/reports/tests/release/js/report.js deleted file mode 100644 index a4455e4..0000000 --- a/app/build/reports/tests/release/js/report.js +++ /dev/null @@ -1,101 +0,0 @@ -var tabs = new Object(); - -function initTabs() { - var container = document.getElementById('tabs'); - tabs.tabs = findTabs(container); - tabs.titles = findTitles(tabs.tabs); - tabs.headers = findHeaders(container); - tabs.select = select; - tabs.deselectAll = deselectAll; - tabs.select(0); - return true; -} - -window.onload = initTabs; - -function switchTab() { - var id = this.id.substr(1); - for (var i = 0; i < tabs.tabs.length; i++) { - if (tabs.tabs[i].id == id) { - tabs.select(i); - break; - } - } - return false; -} - -function select(i) { - this.deselectAll(); - changeElementClass(this.tabs[i], 'tab selected'); - changeElementClass(this.headers[i], 'selected'); - while (this.headers[i].firstChild) { - this.headers[i].removeChild(this.headers[i].firstChild); - } - var h2 = document.createElement('H2'); - h2.appendChild(document.createTextNode(this.titles[i])); - this.headers[i].appendChild(h2); -} - -function deselectAll() { - for (var i = 0; i < this.tabs.length; i++) { - changeElementClass(this.tabs[i], 'tab deselected'); - changeElementClass(this.headers[i], 'deselected'); - while (this.headers[i].firstChild) { - this.headers[i].removeChild(this.headers[i].firstChild); - } - var a = document.createElement('A'); - a.setAttribute('id', 'ltab' + i); - a.setAttribute('href', '#tab' + i); - a.onclick = switchTab; - a.appendChild(document.createTextNode(this.titles[i])); - this.headers[i].appendChild(a); - } -} - -function changeElementClass(element, classValue) { - if (element.getAttribute('className')) { - /* IE */ - element.setAttribute('className', classValue) - } else { - element.setAttribute('class', classValue) - } -} - -function findTabs(container) { - return findChildElements(container, 'DIV', 'tab'); -} - -function findHeaders(container) { - var owner = findChildElements(container, 'UL', 'tabLinks'); - return findChildElements(owner[0], 'LI', null); -} - -function findTitles(tabs) { - var titles = new Array(); - for (var i = 0; i < tabs.length; i++) { - var tab = tabs[i]; - var header = findChildElements(tab, 'H2', null)[0]; - header.parentNode.removeChild(header); - if (header.innerText) { - titles.push(header.innerText) - } else { - titles.push(header.textContent) - } - } - return titles; -} - -function findChildElements(container, name, targetClass) { - var elements = new Array(); - var children = container.childNodes; - for (var i = 0; i < children.length; i++) { - var child = children.item(i); - if (child.nodeType == 1 && child.nodeName == name) { - if (targetClass && child.className.indexOf(targetClass) < 0) { - continue; - } - elements.push(child); - } - } - return elements; -} http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/54bd8752/app/build/test-results/binary/testDebug/output.bin ---------------------------------------------------------------------- diff --git a/app/build/test-results/binary/testDebug/output.bin b/app/build/test-results/binary/testDebug/output.bin deleted file mode 100644 index e69de29..0000000 http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/54bd8752/app/build/test-results/binary/testDebug/output.bin.idx ---------------------------------------------------------------------- diff --git a/app/build/test-results/binary/testDebug/output.bin.idx b/app/build/test-results/binary/testDebug/output.bin.idx deleted file mode 100644 index f76dd23..0000000 Binary files a/app/build/test-results/binary/testDebug/output.bin.idx and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/54bd8752/app/build/test-results/binary/testDebug/results.bin ---------------------------------------------------------------------- diff --git a/app/build/test-results/binary/testDebug/results.bin b/app/build/test-results/binary/testDebug/results.bin deleted file mode 100644 index e69de29..0000000 http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/54bd8752/app/build/test-results/binary/testRelease/output.bin ---------------------------------------------------------------------- diff --git a/app/build/test-results/binary/testRelease/output.bin b/app/build/test-results/binary/testRelease/output.bin deleted file mode 100644 index e69de29..0000000 http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/54bd8752/app/build/test-results/binary/testRelease/output.bin.idx ---------------------------------------------------------------------- diff --git a/app/build/test-results/binary/testRelease/output.bin.idx b/app/build/test-results/binary/testRelease/output.bin.idx deleted file mode 100644 index f76dd23..0000000 Binary files a/app/build/test-results/binary/testRelease/output.bin.idx and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/54bd8752/app/build/test-results/binary/testRelease/results.bin ---------------------------------------------------------------------- diff --git a/app/build/test-results/binary/testRelease/results.bin b/app/build/test-results/binary/testRelease/results.bin deleted file mode 100644 index e69de29..0000000 http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/54bd8752/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 778fed1..0fbdbfb 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 @@ -44,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; @@ -217,10 +218,10 @@ public class WorkflowItemFragment extends Fragment implements SwipeRefreshLayout ((TextView) emptyView).setText(emptyText); } } - +//handle a request to query for given workflows private void performSearch(String search){ WorkflowAdapter ladapter = new WorkflowAdapter(getActivity()); - WorkflowAdapter wk = WorkflowItemFragment.searchAdpater;//workflowAdapter; + WorkflowAdapter wk = (WorkflowAdapter) mListView.getAdapter();//workflowAdapter; if(null != wk) for(int i=0; i< wk.getItemCount(); i++) { @@ -229,8 +230,12 @@ public class WorkflowItemFragment extends Fragment implements SwipeRefreshLayout ladapter.addWorkflow(workflow); } } - mListView.setAdapter(ladapter); -// mListView.swapAdapter(ladapter, true); + else{ + Toast.makeText(getActivity(),"No workflows found matching criteria", Toast.LENGTH_SHORT).show(); + } + mListView.swapAdapter(ladapter, true); + if(ladapter.getItemCount()==0) + Toast.makeText(getActivity(),"No workflows found matching criteria", Toast.LENGTH_SHORT).show(); } @Override @@ -238,6 +243,11 @@ public class WorkflowItemFragment extends Fragment implements SwipeRefreshLayout new WorkflowLoader(getActivity(),swipeRefreshLayout).execute(); } + /** + * Search action triggered, handle the search request. Filter the workflows by name/title and swap current adapter with the new adapter + * @param query Search string criteria + * @return whether or not user handled request 'manually' + */ @Override public boolean onQueryTextSubmit(String query) { performSearch(query); @@ -256,6 +266,9 @@ public class WorkflowItemFragment extends Fragment implements SwipeRefreshLayout public void run() { WorkflowItemFragment.searchAdpater = new WorkflowAdapter(cx,data); WorkflowItemFragment.mListView.setAdapter(WorkflowItemFragment.searchAdpater); + if(data.size() == 0){ + Toast.makeText(cx, cx.getResources().getString(R.string.err_workflow_conn), Toast.LENGTH_LONG).show(); + } } }); } http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/54bd8752/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 6164a36..e163c9f 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 @@ -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,savedInstanceState,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, - workflowID); + ""+workflowID); } @Override http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/54bd8752/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 f90354f..5b3c363 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 @@ -34,6 +34,8 @@ import android.content.DialogInterface; import android.content.Intent; import android.content.Loader; import android.database.Cursor; +import android.graphics.Bitmap; +import android.graphics.BitmapFactory; import android.media.Image; import android.net.Uri; import android.os.AsyncTask; @@ -85,12 +87,13 @@ public class WorkflowdetailFragment extends Fragment implements View.OnClickList */ private static final String ARG_SECTION_NUMBER = "section_number"; private DownloadManager downloadManager; - View rootView; - private ProgressDialog progressDialog; + static View rootView; + private static ProgressDialog progressDialog; public AlertDialog runDialog; public AlertDialog.Builder alertDialogBuilder; - private String download_url; + private static String download_url; public static long WORKFLO_ID; + public static Context cont; /** * Returns a new instance of this fragment for the given section @@ -114,7 +117,7 @@ public class WorkflowdetailFragment extends Fragment implements View.OnClickList 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); + progressDialog.setCancelable(false); WORKFLO_ID = workflowid; Button createRun = (Button) rootView.findViewById(R.id.run_wk); @@ -134,6 +137,7 @@ public class WorkflowdetailFragment extends Fragment implements View.OnClickList @Override public void onAttach(Activity activity) { super.onAttach(activity); + cont = getActivity(); } @Override @@ -170,22 +174,21 @@ public class WorkflowdetailFragment extends Fragment implements View.OnClickList @Override public void onResume() { super.onResume(); - getActivity().getLoaderManager().initLoader(1, null, this); + getActivity().getLoaderManager().initLoader(1, null, this).forceLoad(); } @Override public Loader<Workflow> onCreateLoader(int i, Bundle bundle) { - // progressDialog = ProgressDialog.show(getActivity(),"",getActivity().getResources().getString(R.string.loading)); - progressDialog.show(); + return new DetailsLoader(getActivity(), DetailsLoader.LOAD_TYPE.TYPE_WORKFLOW_DETAIL, - getActivity().getIntent().getLongExtra("workflowid", 0)); + getActivity().getIntent().getStringExtra("uri")); } @Override public void onLoadFinished(Loader<Workflow> workflowLoader, Workflow workflow) { - TextView author = (TextView) rootView.findViewById(R.id.wkf_author); + /* TextView author = (TextView) rootView.findViewById(R.id.wkf_author); author.append("->" + workflow.getWorkflow_author()); TextView title = (TextView) rootView.findViewById(R.id.wtitle); title.setText(workflow.getWorkflow_title()); @@ -199,7 +202,7 @@ public class WorkflowdetailFragment extends Fragment implements View.OnClickList // preview.setImageURI(Uri.parse(workflow.getWorkflow_remote_url())); download_url =workflow.getWorkflow_remote_url(); // progressDialog.cancel(); - progressDialog.dismiss(); + */ // progressDialog.dismiss(); } @Override @@ -207,6 +210,29 @@ public class WorkflowdetailFragment extends Fragment implements View.OnClickList workflowLoader.reset(); } + public static void setWorkflowDetails(final Workflow wk){ + ((Activity)cont).runOnUiThread(new Runnable() { + @Override + public void run() { + //update UI with code here + TextView author = (TextView) rootView.findViewById(R.id.wkf_author); + author.append("->" + wk.getWorkflow_author()); + TextView title = (TextView) rootView.findViewById(R.id.wtitle); + title.setText(wk.getWorkflow_title()); + TextView desc = (TextView) rootView.findViewById(R.id.wdescription); + desc.setText(wk.getWorkflow_description()); + TextView createdat = (TextView) rootView.findViewById(R.id.wcreatedat); + createdat.setText("Created : " + wk.getWorkflow_datecreated()); + TextView updated = (TextView) rootView.findViewById(R.id.wupdatedat); + updated.setText(wk.getWorkflow_datemodified() + wk.getWorkflow_remote_url()); + ImageView preview = (ImageView) rootView.findViewById(R.id.wkf_image); + preview.setImageURI(Uri.parse("http://www.myexperiment.org/workflows/5/versions/2/previews/full")); + download_url =wk.getWorkflow_remote_url(); + + // progressDialog.dismiss(); + } + }); + } //create and return a new TextView public TextView createTextView(Context mcontext, String placeholder){ TextView tv = new TextView(mcontext); http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/54bd8752/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 f270b63..7520cfd 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -70,6 +70,7 @@ limitations under the License. <string name="detail_title_section3">Licence | Policy</string> <string name="detail_title_section4"> About </string> <string name="play_workflow">Create Run</string> + <string name="err_workflow_conn">Unable to fetch latest workflows. Please check your network connectivity</string> <string name="downloadfailed">Download Failed. Please try again</string> <string name="downloadprogress">Workflow download in progress</string> http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/54bd8752/local.properties ---------------------------------------------------------------------- diff --git a/local.properties b/local.properties deleted file mode 100644 index 90de135..0000000 --- a/local.properties +++ /dev/null @@ -1,10 +0,0 @@ -## This file is automatically generated by Android Studio. -# Do not modify this file -- YOUR CHANGES WILL BE ERASED! -# -# This file should *NOT* be checked into Version Control Systems, -# as it contains information specific to your local configuration. -# -# Location of the SDK. This is only used by Gradle. -# For customization when using a Version Control System, please read the -# header note. -sdk.dir=/root/Desktop/android-studio/sdk \ No newline at end of file
