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/03 14:49:11 UTC
[01/50] [abbrv] incubator-taverna-mobile git commit: add download
workflow content and upload to taverna player method in Data layer
Repository: incubator-taverna-mobile
Updated Branches:
refs/heads/master f4b64b13d -> afae2b90f
add download workflow content and upload to taverna player method in Data layer
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/63402bdf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/63402bdf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/63402bdf
Branch: refs/heads/master
Commit: 63402bdf3458c01642e6e1acb892dafbc5907826
Parents: 9ad5a11
Author: Sagar <ku...@gmail.com>
Authored: Fri Aug 26 23:41:40 2016 +0530
Committer: Sagar <ku...@gmail.com>
Committed: Fri Aug 26 23:41:40 2016 +0530
----------------------------------------------------------------------
.../org/apache/taverna/mobile/data/DataManager.java | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/63402bdf/app/src/main/java/org/apache/taverna/mobile/data/DataManager.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/data/DataManager.java b/app/src/main/java/org/apache/taverna/mobile/data/DataManager.java
index 420bec0..c9bc757 100644
--- a/app/src/main/java/org/apache/taverna/mobile/data/DataManager.java
+++ b/app/src/main/java/org/apache/taverna/mobile/data/DataManager.java
@@ -31,6 +31,7 @@ import org.apache.taverna.mobile.data.remote.BaseApiManager;
import java.util.List;
import java.util.Map;
+import okhttp3.RequestBody;
import okhttp3.ResponseBody;
import rx.Observable;
import rx.functions.Func1;
@@ -166,9 +167,20 @@ public class DataManager {
});
}
-
+ /**
+ * @param url is Workflow's content xml URL
+ * @return OkHTTP ResponseBody of download file
+ */
public Observable<ResponseBody> downloadWorkflowContent(String url) {
return mBaseApiManager.getTavernaApi().downloadWorkflowContent(url);
}
+ /**
+ * @param body is body of
+ * @return OkHTTP ResponseBody of requested
+ */
+ public Observable<ResponseBody> uploadWorkflowContent(RequestBody body, String baseAuth) {
+ return mBaseApiManager.getTavernaPlayerApi().uploadWorkflow(body, baseAuth);
+ }
+
}
\ No newline at end of file
[25/50] [abbrv] incubator-taverna-mobile git commit: add content-uri
in requested URL
Posted by ia...@apache.org.
add content-uri in requested URL
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/afa295d0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/afa295d0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/afa295d0
Branch: refs/heads/master
Commit: afa295d07a5119136bab809f86716f24eb5af78d
Parents: 8757c9c
Author: Sagar <ku...@gmail.com>
Authored: Mon Sep 26 14:35:12 2016 +0530
Committer: Sagar <ku...@gmail.com>
Committed: Mon Sep 26 14:35:12 2016 +0530
----------------------------------------------------------------------
.../taverna/mobile/ui/workflowdetail/WorkflowDetailFragment.java | 1 +
.../taverna/mobile/ui/workflowdetail/WorkflowDetailPresenter.java | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/afa295d0/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailFragment.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailFragment.java b/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailFragment.java
index db88f92..2b3ff30 100644
--- a/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailFragment.java
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailFragment.java
@@ -170,6 +170,7 @@ public class WorkflowDetailFragment extends Fragment implements WorkflowDetailMv
@OnClick(R.id.fabRun)
void fabRunClick(View v){
Intent intent = new Intent(getActivity(), WorkflowRunActivity.class);
+ intent.putExtra(WorkflowRunActivity.WORKFLOW_URL,mWorkflow.getContentUri());
startActivity(intent);
}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/afa295d0/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailPresenter.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailPresenter.java b/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailPresenter.java
index d8e33f5..01e6c67 100644
--- a/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailPresenter.java
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailPresenter.java
@@ -197,7 +197,7 @@ public class WorkflowDetailPresenter extends BasePresenter<WorkflowDetailMvpView
Map<String, String> option = new HashMap<>();
option.put("elements", "id,title,type,uploader,preview,created-at,svg,updated-at," +
- "description,license-type,tags");
+ "description,license-type,tags,content-uri");
return option;
}
[17/50] [abbrv] incubator-taverna-mobile git commit: add get player
user credential method
Posted by ia...@apache.org.
add get player user credential method
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/6f6a98af
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/6f6a98af
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/6f6a98af
Branch: refs/heads/master
Commit: 6f6a98af02120277de6744dba07bc269e123df24
Parents: 1aa2c70
Author: Sagar <ku...@gmail.com>
Authored: Sun Sep 25 21:52:58 2016 +0530
Committer: Sagar <ku...@gmail.com>
Committed: Sun Sep 25 21:52:58 2016 +0530
----------------------------------------------------------------------
.../org/apache/taverna/mobile/data/local/PreferencesHelper.java | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/6f6a98af/app/src/main/java/org/apache/taverna/mobile/data/local/PreferencesHelper.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/data/local/PreferencesHelper.java b/app/src/main/java/org/apache/taverna/mobile/data/local/PreferencesHelper.java
index 1d7d679..e98a494 100644
--- a/app/src/main/java/org/apache/taverna/mobile/data/local/PreferencesHelper.java
+++ b/app/src/main/java/org/apache/taverna/mobile/data/local/PreferencesHelper.java
@@ -183,4 +183,9 @@ public class PreferencesHelper {
mPref.edit().putString(PREF_KEY_PLAYER_CREDENTIAL, credential).apply();
}
+ public String getUserPlayerCredential() {
+ return mPref.getString(PREF_KEY_PLAYER_CREDENTIAL," ");
+ }
+
+
}
[47/50] [abbrv] incubator-taverna-mobile git commit: add fab click
listener in favourite t2 workflow
Posted by ia...@apache.org.
add fab click listener in favourite t2 workflow
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/3809ea2d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/3809ea2d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/3809ea2d
Branch: refs/heads/master
Commit: 3809ea2deef4d5e64e265bcbf1eda2108d0cdeff
Parents: e1c3b34
Author: Sagar <ku...@gmail.com>
Authored: Wed Sep 28 16:05:09 2016 +0530
Committer: Sagar <ku...@gmail.com>
Committed: Wed Sep 28 16:05:09 2016 +0530
----------------------------------------------------------------------
.../FavouriteWorkflowDetailFragment.java | 15 +++++++++++++++
1 file changed, 15 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/3809ea2d/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflowdetail/FavouriteWorkflowDetailFragment.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflowdetail/FavouriteWorkflowDetailFragment.java b/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflowdetail/FavouriteWorkflowDetailFragment.java
index c3494ff..7ca26a9 100644
--- a/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflowdetail/FavouriteWorkflowDetailFragment.java
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflowdetail/FavouriteWorkflowDetailFragment.java
@@ -41,6 +41,7 @@ import android.widget.ProgressBar;
import android.widget.RelativeLayout;
import android.widget.ScrollView;
import android.widget.TextView;
+import android.widget.Toast;
import com.bumptech.glide.Glide;
import com.bumptech.glide.load.engine.DiskCacheStrategy;
@@ -52,6 +53,7 @@ import org.apache.taverna.mobile.data.model.User;
import org.apache.taverna.mobile.data.model.Workflow;
import org.apache.taverna.mobile.ui.imagezoom.ImageZoomActivity;
import org.apache.taverna.mobile.ui.imagezoom.ImageZoomFragment;
+import org.apache.taverna.mobile.ui.workflowrun.WorkflowRunActivity;
import org.apache.taverna.mobile.utils.ConnectionInfo;
import butterknife.BindView;
@@ -175,6 +177,19 @@ public class FavouriteWorkflowDetailFragment extends Fragment
mWorkflowDetailPresenter.setFavourite(id);
}
+
+ @OnClick(R.id.fabRun)
+ void fabRunClick(View v) {
+ if (mWorkflow.getType().getContent().equals("Taverna 2")) {
+ Intent intent = new Intent(getActivity(), WorkflowRunActivity.class);
+ intent.putExtra(WorkflowRunActivity.WORKFLOW_URL, mWorkflow.getContentUri());
+ startActivity(intent);
+ } else {
+ Toast.makeText(getActivity(), "We can only run Taverna 2 workflow", Toast
+ .LENGTH_LONG).show();
+ }
+ }
+
@OnClick(R.id.ivWorkflowImage)
void zoomImage(View v) {
[24/50] [abbrv] incubator-taverna-mobile git commit: add activities
in manifest
Posted by ia...@apache.org.
add activities in manifest
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/8757c9ca
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/8757c9ca
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/8757c9ca
Branch: refs/heads/master
Commit: 8757c9cac05bac05e0139f93d567b3c11de548b3
Parents: adeb5df
Author: Sagar <ku...@gmail.com>
Authored: Sun Sep 25 21:56:43 2016 +0530
Committer: Sagar <ku...@gmail.com>
Committed: Sun Sep 25 21:56:43 2016 +0530
----------------------------------------------------------------------
app/src/main/AndroidManifest.xml | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/8757c9ca/app/src/main/AndroidManifest.xml
----------------------------------------------------------------------
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index ad0b96e..3fe8240 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -124,6 +124,11 @@ limitations under the License.
android:label="@string/image_zoom"
android:exported="true"
/>
+
+ <activity android:name=".ui.workflowrun.WorkflowRunActivity"
+ android:label="@string/image_zoom"
+ android:exported="true"
+ />
</application>
</manifest>
[43/50] [abbrv] incubator-taverna-mobile git commit: remove
checkstyle and findbug error
Posted by ia...@apache.org.
remove checkstyle and findbug error
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/fc036a7b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/fc036a7b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/fc036a7b
Branch: refs/heads/master
Commit: fc036a7bff22af3b747a28f5d874e4d178197bf0
Parents: a932d6d
Author: Sagar <ku...@gmail.com>
Authored: Tue Sep 27 15:26:00 2016 +0530
Committer: Sagar <ku...@gmail.com>
Committed: Tue Sep 27 15:26:00 2016 +0530
----------------------------------------------------------------------
.../java/org/apache/taverna/mobile/TavernaApplication.java | 5 +++--
.../apache/taverna/mobile/activities/SettingsActivity.java | 2 +-
.../apache/taverna/mobile/data/remote/BaseApiManager.java | 4 ++--
.../taverna/mobile/ui/playerlogin/PlayerLoginPresenter.java | 5 +++--
.../taverna/mobile/ui/workflowrun/WorkflowRunActivity.java | 8 ++++----
5 files changed, 13 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/fc036a7b/app/src/main/java/org/apache/taverna/mobile/TavernaApplication.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/TavernaApplication.java b/app/src/main/java/org/apache/taverna/mobile/TavernaApplication.java
index 13d8280..100a3b0 100644
--- a/app/src/main/java/org/apache/taverna/mobile/TavernaApplication.java
+++ b/app/src/main/java/org/apache/taverna/mobile/TavernaApplication.java
@@ -37,8 +37,9 @@ public class TavernaApplication extends Application {
@Override
public void onCreate() {
super.onCreate();
-
- instance = this;
+ if (instance == null) {
+ instance = this;
+ }
FlowManager.init(new FlowConfig.Builder(this).build());
Stetho.initializeWithDefaults(this);
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/fc036a7b/app/src/main/java/org/apache/taverna/mobile/activities/SettingsActivity.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/activities/SettingsActivity.java b/app/src/main/java/org/apache/taverna/mobile/activities/SettingsActivity.java
index 95f3f87..c56e481 100644
--- a/app/src/main/java/org/apache/taverna/mobile/activities/SettingsActivity.java
+++ b/app/src/main/java/org/apache/taverna/mobile/activities/SettingsActivity.java
@@ -75,7 +75,7 @@ public class SettingsActivity extends PreferenceActivity {
} else {
// For all other preferences, set the summary to the value's
// simple string representation.
- if(preference.getKey().equals(PreferencesHelper.PREF_KEY_PLAYER_URL)){
+ if (preference.getKey().equals(PreferencesHelper.PREF_KEY_PLAYER_URL)) {
new PreferencesHelper(TavernaApplication.getContext())
.setUserPlayerLoggedInFlag(false);
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/fc036a7b/app/src/main/java/org/apache/taverna/mobile/data/remote/BaseApiManager.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/data/remote/BaseApiManager.java b/app/src/main/java/org/apache/taverna/mobile/data/remote/BaseApiManager.java
index d276566..c3747e8 100644
--- a/app/src/main/java/org/apache/taverna/mobile/data/remote/BaseApiManager.java
+++ b/app/src/main/java/org/apache/taverna/mobile/data/remote/BaseApiManager.java
@@ -70,7 +70,7 @@ public class BaseApiManager {
}
public TavernaPlayerService getTavernaPlayerApi() {
- return createJsonApi(TavernaPlayerService.class, new PreferencesHelper
- (TavernaApplication.getContext()).getPlayerURL());
+ return createJsonApi(TavernaPlayerService.class,
+ new PreferencesHelper(TavernaApplication.getContext()).getPlayerURL());
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/fc036a7b/app/src/main/java/org/apache/taverna/mobile/ui/playerlogin/PlayerLoginPresenter.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/playerlogin/PlayerLoginPresenter.java b/app/src/main/java/org/apache/taverna/mobile/ui/playerlogin/PlayerLoginPresenter.java
index 170432d..25c8fea 100644
--- a/app/src/main/java/org/apache/taverna/mobile/ui/playerlogin/PlayerLoginPresenter.java
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/playerlogin/PlayerLoginPresenter.java
@@ -76,8 +76,9 @@ public class PlayerLoginPresenter extends BasePresenter<PlayerLoginMvpView> {
getMvpView().showCredentialError();
} else if (((HttpException) e).code() == 406) {
getMvpView().validCredential();
- mDataManager.getPreferencesHelper().setUserPlayerLoggedInFlagAndCredential
- (loginFlag, getEncodedCredential(username, password));
+ mDataManager.getPreferencesHelper()
+ .setUserPlayerLoggedInFlagAndCredential(loginFlag,
+ getEncodedCredential(username, password));
} else {
getMvpView().showError("Server Error");
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/fc036a7b/app/src/main/java/org/apache/taverna/mobile/ui/workflowrun/WorkflowRunActivity.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/workflowrun/WorkflowRunActivity.java b/app/src/main/java/org/apache/taverna/mobile/ui/workflowrun/WorkflowRunActivity.java
index 3022449..1a40847 100644
--- a/app/src/main/java/org/apache/taverna/mobile/ui/workflowrun/WorkflowRunActivity.java
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/workflowrun/WorkflowRunActivity.java
@@ -127,12 +127,12 @@ public class WorkflowRunActivity extends FragmentActivity implements WorkflowRun
@Override
public void setInputsAttribute(int id) {
- String playerURL=dataManager.getPreferencesHelper().getPlayerURL();
+ String playerURL = dataManager.getPreferencesHelper().getPlayerURL();
- if (playerURL.trim().endsWith("/")){
- playerURL=playerURL.substring(0,playerURL.length()-1);
+ if (playerURL.trim().endsWith("/")) {
+ playerURL = playerURL.substring(0, playerURL.length() - 1);
}
- workflowRunURL = playerURL+"/workflows/" + id +
+ workflowRunURL = playerURL + "/workflows/" + id +
"/runs/new";
mPager.getAdapter().notifyDataSetChanged();
}
[33/50] [abbrv] incubator-taverna-mobile git commit: remove PMD error
Posted by ia...@apache.org.
remove PMD error
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/0ccd37c7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/0ccd37c7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/0ccd37c7
Branch: refs/heads/master
Commit: 0ccd37c74ace34d1522556ab4678014d32f4669e
Parents: 6168a6e
Author: Sagar <ku...@gmail.com>
Authored: Mon Sep 26 15:19:23 2016 +0530
Committer: Sagar <ku...@gmail.com>
Committed: Mon Sep 26 15:19:23 2016 +0530
----------------------------------------------------------------------
.../mobile/ui/workflowdetail/WorkflowDetailFragment.java | 2 +-
.../taverna/mobile/ui/workflowrun/WorkflowRunPresenter.java | 8 +++++---
.../apache/taverna/mobile/utils/NonSwipeableViewPager.java | 4 +++-
.../java/org/apache/taverna/mobile/utils/WebViewGen.java | 8 ++++----
4 files changed, 13 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/0ccd37c7/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailFragment.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailFragment.java b/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailFragment.java
index d2970e7..aa90f3e 100644
--- a/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailFragment.java
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailFragment.java
@@ -170,7 +170,7 @@ public class WorkflowDetailFragment extends Fragment implements WorkflowDetailMv
@OnClick(R.id.fabRun)
void fabRunClick(View v) {
- if (mWorkflow.getType().getContent().toUpperCase().equals("Taverna 2".toUpperCase())) {
+ if (mWorkflow.getType().getContent().equals("Taverna 2")) {
Intent intent = new Intent(getActivity(), WorkflowRunActivity.class);
intent.putExtra(WorkflowRunActivity.WORKFLOW_URL, mWorkflow.getContentUri());
startActivity(intent);
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/0ccd37c7/app/src/main/java/org/apache/taverna/mobile/ui/workflowrun/WorkflowRunPresenter.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/workflowrun/WorkflowRunPresenter.java b/app/src/main/java/org/apache/taverna/mobile/ui/workflowrun/WorkflowRunPresenter.java
index 72b1fd1..afb8761 100644
--- a/app/src/main/java/org/apache/taverna/mobile/ui/workflowrun/WorkflowRunPresenter.java
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/workflowrun/WorkflowRunPresenter.java
@@ -20,6 +20,7 @@ package org.apache.taverna.mobile.ui.workflowrun;
import android.util.Base64;
+import android.util.Log;
import org.apache.taverna.mobile.data.DataManager;
import org.apache.taverna.mobile.data.model.PlayerWorkflow;
@@ -42,7 +43,7 @@ import rx.schedulers.Schedulers;
public class WorkflowRunPresenter extends BasePresenter<WorkflowRunMvpView> {
-
+ private static final String TAG = WorkflowRunPresenter.class.getSimpleName();
private final DataManager mDataManager;
private Subscription mSubscriptions;
@@ -87,8 +88,9 @@ public class WorkflowRunPresenter extends BasePresenter<WorkflowRunMvpView> {
String str = "";
- while ((str = bufferedReader.readLine()) != null)
+ while ((str = bufferedReader.readLine()) != null) {
sb.append(str);
+ }
bufferedReader.close();
@@ -99,7 +101,7 @@ public class WorkflowRunPresenter extends BasePresenter<WorkflowRunMvpView> {
post = "{\"workflow\":" + data + "}";
flag = true;
} catch (IOException e) {
- e.printStackTrace();
+ Log.e(TAG, "call: ", e);
}
if (flag) {
RequestBody body =
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/0ccd37c7/app/src/main/java/org/apache/taverna/mobile/utils/NonSwipeableViewPager.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/utils/NonSwipeableViewPager.java b/app/src/main/java/org/apache/taverna/mobile/utils/NonSwipeableViewPager.java
index 9d721b5..e5be099 100644
--- a/app/src/main/java/org/apache/taverna/mobile/utils/NonSwipeableViewPager.java
+++ b/app/src/main/java/org/apache/taverna/mobile/utils/NonSwipeableViewPager.java
@@ -3,6 +3,7 @@ package org.apache.taverna.mobile.utils;
import android.content.Context;
import android.support.v4.view.ViewPager;
import android.util.AttributeSet;
+import android.util.Log;
import android.view.MotionEvent;
import android.view.animation.DecelerateInterpolator;
import android.widget.Scroller;
@@ -11,6 +12,7 @@ import java.lang.reflect.Field;
public class NonSwipeableViewPager extends ViewPager {
+ private static final String TAG = NonSwipeableViewPager.class.getSimpleName();
public NonSwipeableViewPager(Context context) {
super(context);
setMyScroller();
@@ -42,7 +44,7 @@ public class NonSwipeableViewPager extends ViewPager {
scroller.setAccessible(true);
scroller.set(this, new MyScroller(getContext()));
} catch (Exception e) {
- e.printStackTrace();
+ Log.e(TAG, "setMyScroller: ", e);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/0ccd37c7/app/src/main/java/org/apache/taverna/mobile/utils/WebViewGen.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/utils/WebViewGen.java b/app/src/main/java/org/apache/taverna/mobile/utils/WebViewGen.java
index 2dd4bc3..d0900ed 100644
--- a/app/src/main/java/org/apache/taverna/mobile/utils/WebViewGen.java
+++ b/app/src/main/java/org/apache/taverna/mobile/utils/WebViewGen.java
@@ -14,11 +14,11 @@ import android.widget.ProgressBar;
import org.apache.taverna.mobile.R;
public class WebViewGen extends Fragment {
- private static final String PARAM1 = "URL";
+ private static final String PARAM1 = "url";
private int flag;
private ProgressBar progressBar;
private WebView web;
- private String URL;
+ private String url;
public static WebViewGen newInstance(String URL) {
@@ -33,7 +33,7 @@ public class WebViewGen extends Fragment {
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
if (getArguments() != null) {
- URL = getArguments().getString(PARAM1);
+ url = getArguments().getString(PARAM1);
}
}
@@ -50,7 +50,7 @@ public class WebViewGen extends Fragment {
web.setWebViewClient(new WebClient());
web.getSettings().setJavaScriptEnabled(true);
web.getSettings().setBuiltInZoomControls(true);
- web.loadUrl(URL);
+ web.loadUrl(url);
web.canGoBack();
return layout;
[34/50] [abbrv] incubator-taverna-mobile git commit: add licence
header
Posted by ia...@apache.org.
add licence header
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/c247d778
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/c247d778
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/c247d778
Branch: refs/heads/master
Commit: c247d778c5e6920c3882de6eb952eb7e4780e853
Parents: 0ccd37c
Author: Sagar <ku...@gmail.com>
Authored: Mon Sep 26 15:28:26 2016 +0530
Committer: Sagar <ku...@gmail.com>
Committed: Mon Sep 26 15:28:26 2016 +0530
----------------------------------------------------------------------
.../mobile/data/model/InputsAttribute.java | 18 ++++++++++++++++++
.../mobile/data/model/PlayerWorkflow.java | 18 ++++++++++++++++++
.../mobile/data/model/PlayerWorkflowDetail.java | 18 ++++++++++++++++++
.../apache/taverna/mobile/data/model/Run.java | 18 ++++++++++++++++++
.../mobile/data/remote/TavernaPlayerService.java | 18 ++++++++++++++++++
.../taverna/mobile/ui/DownloadingFragment.java | 18 ++++++++++++++++++
.../ui/playerlogin/PlayerLoginFragment.java | 18 ++++++++++++++++++
.../ui/playerlogin/PlayerLoginMvpView.java | 18 ++++++++++++++++++
.../ui/playerlogin/PlayerLoginPresenter.java | 18 ++++++++++++++++++
.../ui/workflowrun/WorkflowRunMvpView.java | 18 ++++++++++++++++++
.../mobile/utils/NonSwipeableViewPager.java | 18 ++++++++++++++++++
.../apache/taverna/mobile/utils/WebViewGen.java | 18 ++++++++++++++++++
.../main/res/layout/activity_workflow_run.xml | 19 +++++++++++++++++++
app/src/main/res/layout/fragment_downloading.xml | 19 +++++++++++++++++++
.../res/layout/fragment_player_login_layout.xml | 19 +++++++++++++++++++
app/src/main/res/layout/webviewgen.xml | 19 +++++++++++++++++++
16 files changed, 292 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/c247d778/app/src/main/java/org/apache/taverna/mobile/data/model/InputsAttribute.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/data/model/InputsAttribute.java b/app/src/main/java/org/apache/taverna/mobile/data/model/InputsAttribute.java
index ca42a53..cb64226 100644
--- a/app/src/main/java/org/apache/taverna/mobile/data/model/InputsAttribute.java
+++ b/app/src/main/java/org/apache/taverna/mobile/data/model/InputsAttribute.java
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package org.apache.taverna.mobile.data.model;
import android.os.Parcel;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/c247d778/app/src/main/java/org/apache/taverna/mobile/data/model/PlayerWorkflow.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/data/model/PlayerWorkflow.java b/app/src/main/java/org/apache/taverna/mobile/data/model/PlayerWorkflow.java
index b57f2e8..dd13c51 100644
--- a/app/src/main/java/org/apache/taverna/mobile/data/model/PlayerWorkflow.java
+++ b/app/src/main/java/org/apache/taverna/mobile/data/model/PlayerWorkflow.java
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package org.apache.taverna.mobile.data.model;
import android.os.Parcel;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/c247d778/app/src/main/java/org/apache/taverna/mobile/data/model/PlayerWorkflowDetail.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/data/model/PlayerWorkflowDetail.java b/app/src/main/java/org/apache/taverna/mobile/data/model/PlayerWorkflowDetail.java
index 323be42..fc94358 100644
--- a/app/src/main/java/org/apache/taverna/mobile/data/model/PlayerWorkflowDetail.java
+++ b/app/src/main/java/org/apache/taverna/mobile/data/model/PlayerWorkflowDetail.java
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package org.apache.taverna.mobile.data.model;
import android.os.Parcel;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/c247d778/app/src/main/java/org/apache/taverna/mobile/data/model/Run.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/data/model/Run.java b/app/src/main/java/org/apache/taverna/mobile/data/model/Run.java
index d48dd69..6e22d9a 100644
--- a/app/src/main/java/org/apache/taverna/mobile/data/model/Run.java
+++ b/app/src/main/java/org/apache/taverna/mobile/data/model/Run.java
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package org.apache.taverna.mobile.data.model;
import android.os.Parcel;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/c247d778/app/src/main/java/org/apache/taverna/mobile/data/remote/TavernaPlayerService.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/data/remote/TavernaPlayerService.java b/app/src/main/java/org/apache/taverna/mobile/data/remote/TavernaPlayerService.java
index a1d475a..1a21f6b 100644
--- a/app/src/main/java/org/apache/taverna/mobile/data/remote/TavernaPlayerService.java
+++ b/app/src/main/java/org/apache/taverna/mobile/data/remote/TavernaPlayerService.java
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package org.apache.taverna.mobile.data.remote;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/c247d778/app/src/main/java/org/apache/taverna/mobile/ui/DownloadingFragment.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/DownloadingFragment.java b/app/src/main/java/org/apache/taverna/mobile/ui/DownloadingFragment.java
index dae1cc5..a2eb05f 100644
--- a/app/src/main/java/org/apache/taverna/mobile/ui/DownloadingFragment.java
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/DownloadingFragment.java
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package org.apache.taverna.mobile.ui;
import android.os.Bundle;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/c247d778/app/src/main/java/org/apache/taverna/mobile/ui/playerlogin/PlayerLoginFragment.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/playerlogin/PlayerLoginFragment.java b/app/src/main/java/org/apache/taverna/mobile/ui/playerlogin/PlayerLoginFragment.java
index 4387870..0d74489 100644
--- a/app/src/main/java/org/apache/taverna/mobile/ui/playerlogin/PlayerLoginFragment.java
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/playerlogin/PlayerLoginFragment.java
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package org.apache.taverna.mobile.ui.playerlogin;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/c247d778/app/src/main/java/org/apache/taverna/mobile/ui/playerlogin/PlayerLoginMvpView.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/playerlogin/PlayerLoginMvpView.java b/app/src/main/java/org/apache/taverna/mobile/ui/playerlogin/PlayerLoginMvpView.java
index 93f6e53..d3840ee 100644
--- a/app/src/main/java/org/apache/taverna/mobile/ui/playerlogin/PlayerLoginMvpView.java
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/playerlogin/PlayerLoginMvpView.java
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package org.apache.taverna.mobile.ui.playerlogin;
import org.apache.taverna.mobile.ui.base.MvpView;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/c247d778/app/src/main/java/org/apache/taverna/mobile/ui/playerlogin/PlayerLoginPresenter.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/playerlogin/PlayerLoginPresenter.java b/app/src/main/java/org/apache/taverna/mobile/ui/playerlogin/PlayerLoginPresenter.java
index dcd0bc6..26a5c28 100644
--- a/app/src/main/java/org/apache/taverna/mobile/ui/playerlogin/PlayerLoginPresenter.java
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/playerlogin/PlayerLoginPresenter.java
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package org.apache.taverna.mobile.ui.playerlogin;
import android.util.Base64;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/c247d778/app/src/main/java/org/apache/taverna/mobile/ui/workflowrun/WorkflowRunMvpView.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/workflowrun/WorkflowRunMvpView.java b/app/src/main/java/org/apache/taverna/mobile/ui/workflowrun/WorkflowRunMvpView.java
index c0ab80e..c5dcff5 100644
--- a/app/src/main/java/org/apache/taverna/mobile/ui/workflowrun/WorkflowRunMvpView.java
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/workflowrun/WorkflowRunMvpView.java
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package org.apache.taverna.mobile.ui.workflowrun;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/c247d778/app/src/main/java/org/apache/taverna/mobile/utils/NonSwipeableViewPager.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/utils/NonSwipeableViewPager.java b/app/src/main/java/org/apache/taverna/mobile/utils/NonSwipeableViewPager.java
index e5be099..6883c24 100644
--- a/app/src/main/java/org/apache/taverna/mobile/utils/NonSwipeableViewPager.java
+++ b/app/src/main/java/org/apache/taverna/mobile/utils/NonSwipeableViewPager.java
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package org.apache.taverna.mobile.utils;
import android.content.Context;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/c247d778/app/src/main/java/org/apache/taverna/mobile/utils/WebViewGen.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/utils/WebViewGen.java b/app/src/main/java/org/apache/taverna/mobile/utils/WebViewGen.java
index d0900ed..96cceac 100644
--- a/app/src/main/java/org/apache/taverna/mobile/utils/WebViewGen.java
+++ b/app/src/main/java/org/apache/taverna/mobile/utils/WebViewGen.java
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package org.apache.taverna.mobile.utils;
import android.graphics.Bitmap;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/c247d778/app/src/main/res/layout/activity_workflow_run.xml
----------------------------------------------------------------------
diff --git a/app/src/main/res/layout/activity_workflow_run.xml b/app/src/main/res/layout/activity_workflow_run.xml
index 77460be..cf4fea9 100644
--- a/app/src/main/res/layout/activity_workflow_run.xml
+++ b/app/src/main/res/layout/activity_workflow_run.xml
@@ -1,4 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
+<!--
+Apache Taverna Mobile
+Copyright 2015 The Apache Software Foundation
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+http://www.apache.org/licenses/LICENSE-2.0
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/c247d778/app/src/main/res/layout/fragment_downloading.xml
----------------------------------------------------------------------
diff --git a/app/src/main/res/layout/fragment_downloading.xml b/app/src/main/res/layout/fragment_downloading.xml
index 79e7f28..108afc7 100644
--- a/app/src/main/res/layout/fragment_downloading.xml
+++ b/app/src/main/res/layout/fragment_downloading.xml
@@ -1,4 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
+<!--
+Apache Taverna Mobile
+Copyright 2015 The Apache Software Foundation
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+http://www.apache.org/licenses/LICENSE-2.0
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/c247d778/app/src/main/res/layout/fragment_player_login_layout.xml
----------------------------------------------------------------------
diff --git a/app/src/main/res/layout/fragment_player_login_layout.xml b/app/src/main/res/layout/fragment_player_login_layout.xml
index 4379459..a6fbb9e 100644
--- a/app/src/main/res/layout/fragment_player_login_layout.xml
+++ b/app/src/main/res/layout/fragment_player_login_layout.xml
@@ -1,4 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
+<!--
+Apache Taverna Mobile
+Copyright 2015 The Apache Software Foundation
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+http://www.apache.org/licenses/LICENSE-2.0
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/c247d778/app/src/main/res/layout/webviewgen.xml
----------------------------------------------------------------------
diff --git a/app/src/main/res/layout/webviewgen.xml b/app/src/main/res/layout/webviewgen.xml
index 212cf39..d7adfb3 100644
--- a/app/src/main/res/layout/webviewgen.xml
+++ b/app/src/main/res/layout/webviewgen.xml
@@ -1,4 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
+<!--
+Apache Taverna Mobile
+Copyright 2015 The Apache Software Foundation
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+http://www.apache.org/licenses/LICENSE-2.0
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">
[27/50] [abbrv] incubator-taverna-mobile git commit: add Workflow Run
Activity with MVP classes
Posted by ia...@apache.org.
add Workflow Run Activity with MVP classes
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/8c1c5bf1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/8c1c5bf1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/8c1c5bf1
Branch: refs/heads/master
Commit: 8c1c5bf1a9ed7c699bcd9e9bfdc9146bf0ce6448
Parents: d411dae
Author: Sagar <ku...@gmail.com>
Authored: Mon Sep 26 14:37:13 2016 +0530
Committer: Sagar <ku...@gmail.com>
Committed: Mon Sep 26 14:37:13 2016 +0530
----------------------------------------------------------------------
.../ui/workflowrun/WorkflowRunActivity.java | 173 +++++++++++++++++++
.../ui/workflowrun/WorkflowRunMvpView.java | 13 ++
.../ui/workflowrun/WorkflowRunPresenter.java | 146 ++++++++++++++++
3 files changed, 332 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/8c1c5bf1/app/src/main/java/org/apache/taverna/mobile/ui/workflowrun/WorkflowRunActivity.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/workflowrun/WorkflowRunActivity.java b/app/src/main/java/org/apache/taverna/mobile/ui/workflowrun/WorkflowRunActivity.java
new file mode 100644
index 0000000..0ba0e1f
--- /dev/null
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/workflowrun/WorkflowRunActivity.java
@@ -0,0 +1,173 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.taverna.mobile.ui.workflowrun;
+
+
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentActivity;
+import android.support.v4.app.FragmentManager;
+import android.support.v4.app.FragmentStatePagerAdapter;
+import android.support.v4.view.PagerAdapter;
+
+import com.anton46.stepsview.StepsView;
+
+import org.apache.taverna.mobile.R;
+import org.apache.taverna.mobile.data.DataManager;
+import org.apache.taverna.mobile.data.local.PreferencesHelper;
+import org.apache.taverna.mobile.ui.DownloadingFragment;
+import org.apache.taverna.mobile.ui.playerlogin.PlayerLoginFragment;
+import org.apache.taverna.mobile.utils.NonSwipeableViewPager;
+import org.apache.taverna.mobile.utils.WebViewGen;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+
+import static com.raizlabs.android.dbflow.config.FlowManager.getContext;
+
+public class WorkflowRunActivity extends FragmentActivity implements WorkflowRunMvpView,
+ PlayerLoginFragment.OnSuccessful {
+
+ public static final String WORKFLOW_URL = "Workflow_url";
+
+
+ private DataManager dataManager;
+
+ private WorkflowRunPresenter mWorkflowRunPresenter;
+
+ @BindView(R.id.stepsView)
+ StepsView mStepsView;
+
+ @BindView(R.id.viewpager)
+ NonSwipeableViewPager mPager;
+
+ private PagerAdapter mPagerAdapter;
+
+ private final String[] labels = {"Player\nLogin","Download", "Upload", "Inputs &\n Run"};
+ int position =0;
+
+ String workflowRunURL;
+
+ String workflowURL;
+
+ @Override
+ protected void onCreate(@Nullable Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+
+ setContentView(R.layout.activity_workflow_run);
+
+ ButterKnife.bind(this);
+
+ dataManager = new DataManager(new PreferencesHelper(getContext()));
+
+ mWorkflowRunPresenter = new WorkflowRunPresenter(dataManager);
+
+ mWorkflowRunPresenter.attachView(this);
+
+
+ mStepsView.setCompletedPosition(position % labels.length)
+ .setLabels(labels)
+ .setBarColorIndicator(
+ getContext().getResources().getColor(R.color.material_blue_grey_800))
+ .setProgressColorIndicator(getContext().getResources().getColor(R.color.colorPrimary))
+ .setLabelColorIndicator(getContext().getResources().getColor(R.color.colorPrimary))
+ .drawView();
+
+
+ mPagerAdapter = new ScreenSlidePagerAdapter(getSupportFragmentManager());
+ mPager.setAdapter(mPagerAdapter);
+
+ if(dataManager.getPreferencesHelper().isUserPlayerLoggedInFlag()){
+ mPager.setCurrentItem(++position);
+ mStepsView.setCompletedPosition(position % labels.length).drawView();
+
+ mWorkflowRunPresenter.runWorkflow(getIntent().getStringExtra(WORKFLOW_URL));
+ }
+
+ }
+
+ @Override
+ protected void onDestroy() {
+ super.onDestroy();
+ mWorkflowRunPresenter.detachView();
+ }
+
+
+ @Override
+ public void onSuccessfulLogin() {
+ position =1;
+ mPager.setCurrentItem(position);
+ mStepsView.setCompletedPosition(position % labels.length).drawView();
+ mWorkflowRunPresenter.runWorkflow("hh");
+ }
+
+ @Override
+ public void movetoUploadWorkflow() {
+ position =2;
+ mPager.setCurrentItem(position);
+ mStepsView.setCompletedPosition(position % labels.length).drawView();
+ }
+
+ @Override
+ public void movetoInputs() {
+ position =3;
+ mStepsView.setCompletedPosition(position % labels.length).drawView();
+ mPager.setCurrentItem(position);
+
+ }
+
+ @Override
+ public void setInputsAttribute(int id) {
+
+ workflowRunURL = "http://139.59.28.12:3000/workflows/"+id+"/runs/new";
+ mPager.getAdapter().notifyDataSetChanged();
+ }
+
+
+ private class ScreenSlidePagerAdapter extends FragmentStatePagerAdapter {
+ public ScreenSlidePagerAdapter(FragmentManager fm) {
+ super(fm);
+ }
+
+ @Override
+ public Fragment getItem(int position) {
+ switch (position){
+ case 0:
+ return PlayerLoginFragment.newInstance();
+ case 1:
+ return DownloadingFragment.newInstance("Downloading Workflow");
+ case 2:
+ return DownloadingFragment.newInstance("Uploading Workflow");
+ case 3:
+ return WebViewGen.newInstance(workflowRunURL);
+ default:
+ return DownloadingFragment.newInstance("Uploading1+ Workflow");
+
+ }
+ }
+
+ @Override
+ public int getCount() {
+ return 4;
+ }
+ }
+
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/8c1c5bf1/app/src/main/java/org/apache/taverna/mobile/ui/workflowrun/WorkflowRunMvpView.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/workflowrun/WorkflowRunMvpView.java b/app/src/main/java/org/apache/taverna/mobile/ui/workflowrun/WorkflowRunMvpView.java
new file mode 100644
index 0000000..727cb38
--- /dev/null
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/workflowrun/WorkflowRunMvpView.java
@@ -0,0 +1,13 @@
+package org.apache.taverna.mobile.ui.workflowrun;
+
+
+import org.apache.taverna.mobile.ui.base.MvpView;
+
+public interface WorkflowRunMvpView extends MvpView {
+
+ void movetoUploadWorkflow();
+
+ void movetoInputs();
+
+ void setInputsAttribute(int id);
+}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/8c1c5bf1/app/src/main/java/org/apache/taverna/mobile/ui/workflowrun/WorkflowRunPresenter.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/workflowrun/WorkflowRunPresenter.java b/app/src/main/java/org/apache/taverna/mobile/ui/workflowrun/WorkflowRunPresenter.java
new file mode 100644
index 0000000..48e6310
--- /dev/null
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/workflowrun/WorkflowRunPresenter.java
@@ -0,0 +1,146 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.taverna.mobile.ui.workflowrun;
+
+
+import android.util.Base64;
+import android.util.Log;
+
+import org.apache.taverna.mobile.data.DataManager;
+import org.apache.taverna.mobile.data.model.PlayerWorkflow;
+import org.apache.taverna.mobile.data.model.PlayerWorkflowDetail;
+import org.apache.taverna.mobile.ui.base.BasePresenter;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+
+import okhttp3.MediaType;
+import okhttp3.RequestBody;
+import okhttp3.ResponseBody;
+import rx.Observable;
+import rx.Observer;
+import rx.Subscription;
+import rx.android.schedulers.AndroidSchedulers;
+import rx.functions.Func1;
+import rx.schedulers.Schedulers;
+
+public class WorkflowRunPresenter extends BasePresenter<WorkflowRunMvpView> {
+
+
+ private final DataManager mDataManager;
+ private Subscription mSubscriptions;
+
+
+ public WorkflowRunPresenter(DataManager dataManager) {
+ mDataManager = dataManager;
+
+ }
+
+ @Override
+ public void attachView(WorkflowRunMvpView mvpView) {
+
+ super.attachView(mvpView);
+
+ }
+
+ @Override
+ public void detachView() {
+ super.detachView();
+ if (mSubscriptions != null) mSubscriptions.unsubscribe();
+ }
+
+
+ public void runWorkflow(String contentURL) {
+ if (mSubscriptions != null) mSubscriptions.unsubscribe();
+
+ mSubscriptions = mDataManager.downloadWorkflowContent(contentURL)
+ .concatMap(new Func1<ResponseBody, Observable<PlayerWorkflow>>() {
+ @Override
+ public Observable<PlayerWorkflow> call(ResponseBody responseBody) {
+
+ StringBuffer sb = new StringBuffer();
+ String post = "";
+
+ String basicAuth = mDataManager.getPreferencesHelper().getUserPlayerCredential();
+ boolean flag = false;
+ try {
+
+ BufferedReader bufferedReader = new BufferedReader(
+ new InputStreamReader(responseBody.byteStream()));
+
+ String str = "";
+
+ while ((str = bufferedReader.readLine()) != null)
+ sb.append(str);
+
+ bufferedReader.close();
+
+ String data = "{\"document\":\"data:application/octet-stream;base64," +
+ Base64.encodeToString(sb.toString().getBytes("UTF-8"), Base64
+ .URL_SAFE | Base64.NO_WRAP).replace('-', '+') + "\"}";
+
+ post = "{\"workflow\":" + data + "}";
+ flag = true;
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ if (flag) {
+ RequestBody body =
+ RequestBody.create(MediaType.parse("application/json"), post);
+
+ return mDataManager.uploadWorkflowContent(body, basicAuth.trim());
+ } else {
+ return Observable.empty();
+ }
+
+
+ }
+ })
+ .concatMap(new Func1<PlayerWorkflow, Observable<PlayerWorkflowDetail>>() {
+ @Override
+ public Observable<PlayerWorkflowDetail> call(PlayerWorkflow playerWorkflow) {
+
+ return mDataManager.getWorkflowDetail(playerWorkflow.getId());
+ }
+ })
+ .observeOn(AndroidSchedulers.mainThread())
+ .subscribeOn(Schedulers.io())
+ .subscribe(new Observer<PlayerWorkflowDetail>() {
+ @Override
+ public void onCompleted() {
+ getMvpView().movetoInputs();
+ }
+
+ @Override
+ public void onError(Throwable e) {
+ Log.e("TAG", "onError: ", e);
+ }
+
+ @Override
+ public void onNext(PlayerWorkflowDetail playerWorkflowDetail) {
+ getMvpView().setInputsAttribute(playerWorkflowDetail.getRun().getWorkflowId());
+ }
+ });
+ }
+
+
+
+
+}
[06/50] [abbrv] incubator-taverna-mobile git commit: add multidex and
enable it
Posted by ia...@apache.org.
add multidex and enable it
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/e089790e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/e089790e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/e089790e
Branch: refs/heads/master
Commit: e089790e140cf8820c92538ed255794f36f53d59
Parents: 48a4992
Author: Sagar <ku...@gmail.com>
Authored: Thu Sep 15 13:48:14 2016 +0530
Committer: Sagar <ku...@gmail.com>
Committed: Thu Sep 15 13:48:14 2016 +0530
----------------------------------------------------------------------
app/build.gradle | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/e089790e/app/build.gradle
----------------------------------------------------------------------
diff --git a/app/build.gradle b/app/build.gradle
index 8561c50..563fce6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -16,6 +16,7 @@ android {
targetSdkVersion 21
versionCode 1
versionName "1.0"
+ multiDexEnabled true
}
buildTypes {
release {
@@ -35,7 +36,7 @@ dependencies {
compile 'com.android.support:cardview-v7:23.3.0'
compile 'com.android.support:recyclerview-v7:23.3.0'
compile 'com.android.support:support-v4:23.3.0'
- compile files('libs/dropbox-android-sdk-1.6.3.jar')
+
compile 'com.android.support:design:23.3.0'
compile 'com.squareup.retrofit2:retrofit:2.0.2'
@@ -74,4 +75,5 @@ dependencies {
compile 'com.facebook.stetho:stetho-okhttp3:1.3.1'
compile 'com.github.chrisbanes:PhotoView:1.2.6'
+ compile 'com.android.support:multidex:1.0.0'
}
[16/50] [abbrv] incubator-taverna-mobile git commit: add player login
fragment with mvp classes
Posted by ia...@apache.org.
add player login fragment with mvp classes
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/1aa2c70a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/1aa2c70a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/1aa2c70a
Branch: refs/heads/master
Commit: 1aa2c70a2163d448d3c5db9db8b10a53faaede46
Parents: 2e4c7bb
Author: Sagar <ku...@gmail.com>
Authored: Sun Sep 25 21:40:33 2016 +0530
Committer: Sagar <ku...@gmail.com>
Committed: Sun Sep 25 21:40:33 2016 +0530
----------------------------------------------------------------------
.../ui/playerlogin/PlayerLoginFragment.java | 252 +++++++++++++++++++
.../ui/playerlogin/PlayerLoginMvpView.java | 13 +
.../ui/playerlogin/PlayerLoginPresenter.java | 79 ++++++
.../res/layout/fragment_player_login_layout.xml | 67 +++++
4 files changed, 411 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/1aa2c70a/app/src/main/java/org/apache/taverna/mobile/ui/playerlogin/PlayerLoginFragment.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/playerlogin/PlayerLoginFragment.java b/app/src/main/java/org/apache/taverna/mobile/ui/playerlogin/PlayerLoginFragment.java
new file mode 100644
index 0000000..35ebedc
--- /dev/null
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/playerlogin/PlayerLoginFragment.java
@@ -0,0 +1,252 @@
+package org.apache.taverna.mobile.ui.playerlogin;
+
+
+import android.content.Context;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.design.widget.Snackbar;
+import android.support.design.widget.TextInputLayout;
+import android.support.v4.app.Fragment;
+import android.text.Editable;
+import android.text.TextWatcher;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.WindowManager;
+import android.widget.CheckBox;
+import android.widget.EditText;
+
+import org.apache.taverna.mobile.R;
+import org.apache.taverna.mobile.data.DataManager;
+import org.apache.taverna.mobile.data.local.PreferencesHelper;
+import org.apache.taverna.mobile.utils.ConnectionInfo;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.OnClick;
+
+
+public class PlayerLoginFragment extends Fragment implements PlayerLoginMvpView, View
+ .OnFocusChangeListener {
+
+ @BindView(R.id.etEmail)
+ EditText mEditTextEmail;
+
+ @BindView(R.id.etPassword)
+ EditText mEditTextPassword;
+
+ @BindView(R.id.input_layout_email)
+ TextInputLayout mTextInputEmail;
+
+ @BindView(R.id.input_layout_password)
+ TextInputLayout mTextInputPassword;
+
+ @BindView(R.id.cbRemember)
+ CheckBox mCheckBoxRemember;
+
+
+ private DataManager dataManager;
+
+ private PlayerLoginPresenter mPlayerLoginPresenter;
+
+ OnSuccessful mCallback;
+
+
+ public static PlayerLoginFragment newInstance() {
+
+ Bundle args = new Bundle();
+
+ PlayerLoginFragment fragment = new PlayerLoginFragment();
+ fragment.setArguments(args);
+ return fragment;
+ }
+
+ @Override
+ public void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+
+ dataManager = new DataManager(new PreferencesHelper(getContext()));
+ mPlayerLoginPresenter = new PlayerLoginPresenter(dataManager);
+
+ }
+
+ @Override
+ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle
+ savedInstanceState) {
+
+ View rootView = inflater.inflate(R.layout.fragment_player_login_layout, container, false);
+ ButterKnife.bind(this, rootView);
+ mPlayerLoginPresenter.attachView(this);
+ return rootView;
+ }
+
+ @Override
+ public void onActivityCreated(@Nullable Bundle savedInstanceState) {
+ super.onActivityCreated(savedInstanceState);
+
+
+ mEditTextEmail.addTextChangedListener(new CustomTextWatcher(mEditTextEmail));
+
+
+ mEditTextPassword.addTextChangedListener(new CustomTextWatcher(mEditTextPassword));
+
+ mEditTextEmail.setOnFocusChangeListener(this);
+
+ mEditTextPassword.setOnFocusChangeListener(this);
+
+
+ //mPlayerLoginPresenter.PlayerLogin("kumarsagar15795@gmail.com", "Sagarishere", true);
+
+
+
+ }
+
+
+ @Override
+ public void onDestroyView() {
+ super.onDestroyView();
+ mPlayerLoginPresenter.detachView();
+ }
+
+
+ @OnClick(R.id.bLogin)
+ public void login(View v) {
+ if (ConnectionInfo.isConnectingToInternet(getContext())) {
+ if (!mEditTextEmail.getText().toString().trim().isEmpty() && !mEditTextPassword
+ .getText().toString().trim().isEmpty()) {
+
+ mPlayerLoginPresenter.playerLogin(mEditTextEmail.getText().toString().trim(),
+ mEditTextPassword.getText().toString().trim(), mCheckBoxRemember
+ .isChecked());
+
+ } else {
+
+ showError("Please enter valid credential");
+ }
+ } else {
+
+ showError("NO Internet Connection");
+ }
+ }
+
+ @Override
+ public void showError(String string) {
+ final Snackbar snackbar = Snackbar.make(mEditTextPassword, string, Snackbar
+ .LENGTH_LONG);
+ snackbar.setAction("OK", new View.OnClickListener() {
+ @Override
+ public void onClick(View view) {
+ snackbar.dismiss();
+ }
+ });
+
+ snackbar.show();
+ }
+
+ @Override
+ public void showCredentialError() {
+ mTextInputEmail.setError(getString(R.string.err_login_email));
+ mTextInputPassword.setError(getString(R.string.err_login_password));
+ requestFocus(mEditTextPassword);
+ }
+
+ @Override
+ public void validCredential() {
+ mCallback.onSuccessfulLogin();
+ }
+
+
+ private void validateEmail() {
+
+ if (mEditTextEmail.getText().toString().trim().isEmpty()) {
+
+ mTextInputEmail.setError(getString(R.string.err_login_email));
+ } else {
+
+ mTextInputEmail.setError(null);
+ }
+
+
+ }
+
+ private void requestFocus(View view) {
+ if (view.requestFocus()) {
+ getActivity().getWindow().setSoftInputMode(WindowManager.LayoutParams
+ .SOFT_INPUT_STATE_ALWAYS_VISIBLE);
+ }
+ }
+
+ private void validatePassword() {
+ if (mEditTextPassword.getText().toString().trim().isEmpty()) {
+
+ mTextInputPassword.setError(getString(R.string.err_login_password));
+ } else {
+
+ mTextInputPassword.setError(null);
+ }
+
+
+ }
+
+ @Override
+ public void onFocusChange(View v, boolean hasFocus) {
+ switch (v.getId()) {
+ case R.id.etEmail:
+ if (!v.hasFocus()) {
+ validateEmail();
+ }
+ break;
+ case R.id.etPassword:
+ if (!v.hasFocus()) {
+ validatePassword();
+ }
+ break;
+ }
+ }
+
+ private class CustomTextWatcher implements TextWatcher {
+
+ private View view;
+
+ private CustomTextWatcher(View view) {
+ this.view = view;
+ }
+
+ public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) {
+
+ }
+
+ public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) {
+
+ }
+
+ public void afterTextChanged(Editable editable) {
+ switch (view.getId()) {
+ case R.id.etEmail:
+ validateEmail();
+ break;
+ case R.id.etPassword:
+ validatePassword();
+ break;
+ }
+ }
+ }
+
+
+ public interface OnSuccessful {
+ void onSuccessfulLogin();
+ }
+
+
+ @Override
+ public void onAttach(Context context) {
+ super.onAttach(context);
+
+ try {
+ mCallback = (OnSuccessful) getActivity();
+ } catch (ClassCastException e) {
+ throw new ClassCastException(getActivity().toString()
+ + " must implement OnSuccessful");
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/1aa2c70a/app/src/main/java/org/apache/taverna/mobile/ui/playerlogin/PlayerLoginMvpView.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/playerlogin/PlayerLoginMvpView.java b/app/src/main/java/org/apache/taverna/mobile/ui/playerlogin/PlayerLoginMvpView.java
new file mode 100644
index 0000000..9e0f9e6
--- /dev/null
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/playerlogin/PlayerLoginMvpView.java
@@ -0,0 +1,13 @@
+package org.apache.taverna.mobile.ui.playerlogin;
+
+import org.apache.taverna.mobile.ui.base.MvpView;
+
+
+public interface PlayerLoginMvpView extends MvpView{
+
+ void showError(String string);
+
+ void showCredentialError();
+
+ void validCredential();
+}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/1aa2c70a/app/src/main/java/org/apache/taverna/mobile/ui/playerlogin/PlayerLoginPresenter.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/playerlogin/PlayerLoginPresenter.java b/app/src/main/java/org/apache/taverna/mobile/ui/playerlogin/PlayerLoginPresenter.java
new file mode 100644
index 0000000..411eca2
--- /dev/null
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/playerlogin/PlayerLoginPresenter.java
@@ -0,0 +1,79 @@
+package org.apache.taverna.mobile.ui.playerlogin;
+
+import android.util.Base64;
+import android.util.Log;
+
+import org.apache.taverna.mobile.data.DataManager;
+import org.apache.taverna.mobile.ui.base.BasePresenter;
+
+import okhttp3.ResponseBody;
+import retrofit2.adapter.rxjava.HttpException;
+import rx.Observer;
+import rx.Subscription;
+import rx.android.schedulers.AndroidSchedulers;
+import rx.schedulers.Schedulers;
+
+
+public class PlayerLoginPresenter extends BasePresenter<PlayerLoginMvpView> {
+
+ private DataManager mDataManager;
+
+ private Subscription mSubscriptions;
+
+ public PlayerLoginPresenter(DataManager dataManager) {
+ mDataManager = dataManager;
+ }
+
+ @Override
+ public void attachView(PlayerLoginMvpView mvpView) {
+ super.attachView(mvpView);
+ }
+
+ @Override
+ public void detachView() {
+ super.detachView();
+ if (mSubscriptions != null) mSubscriptions.unsubscribe();
+ }
+
+ public void playerLogin(final String username, final String password, final boolean loginFlag) {
+ if (mSubscriptions != null) mSubscriptions.unsubscribe();
+
+ mSubscriptions = mDataManager.authPlayerUserLoginDetail(getEncodedCredential(username,
+ password),loginFlag)
+ .observeOn(AndroidSchedulers.mainThread())
+ .subscribeOn(Schedulers.io())
+ .subscribe(new Observer<ResponseBody>() {
+ @Override
+ public void onCompleted() {
+
+ }
+
+ @Override
+ public void onError(Throwable e) {
+ Log.e("TAG", "onError: ", e);
+ if (e instanceof HttpException) {
+ if (((HttpException) e).code() == 401) {
+ getMvpView().showCredentialError();
+ } else if (((HttpException) e).code() == 406) {
+ getMvpView().validCredential();
+ mDataManager.getPreferencesHelper().setUserPlayerLoggedInFlag
+ (loginFlag,getEncodedCredential(username, password));
+
+ }
+ }
+ }
+
+ @Override
+ public void onNext(ResponseBody responseBody) {
+ Log.e("hello", "onCompleted: " + responseBody.byteStream());
+ }
+ });
+
+ }
+
+ private String getEncodedCredential(String username, String password) {
+
+ return "Basic " + Base64.encodeToString((username + ":" + password).getBytes(), Base64
+ .NO_WRAP);
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/1aa2c70a/app/src/main/res/layout/fragment_player_login_layout.xml
----------------------------------------------------------------------
diff --git a/app/src/main/res/layout/fragment_player_login_layout.xml b/app/src/main/res/layout/fragment_player_login_layout.xml
new file mode 100644
index 0000000..4379459
--- /dev/null
+++ b/app/src/main/res/layout/fragment_player_login_layout.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:padding="40dp"
+ >
+
+ <TextView
+ android:id="@+id/header"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:gravity="center"
+ android:textSize="24sp"
+ android:text="Taverna Player Portal Login"/>
+
+ <android.support.design.widget.TextInputLayout
+ android:layout_below="@id/header"
+ android:id="@+id/input_layout_email"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="20dp">
+
+ <EditText
+ android:id="@+id/etEmail"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:hint="@string/hint_email"
+ android:inputType="textEmailAddress"
+ android:singleLine="true"/>
+
+ </android.support.design.widget.TextInputLayout>
+
+ <android.support.design.widget.TextInputLayout
+ android:id="@+id/input_layout_password"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_below="@id/input_layout_email"
+ android:layout_marginTop="20dp">
+
+ <EditText
+ android:id="@+id/etPassword"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:hint="@string/hint_password"
+ android:inputType="textPassword"
+ android:singleLine="true"/>
+
+ </android.support.design.widget.TextInputLayout>
+
+ <CheckBox
+ android:id="@+id/cbRemember"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_below="@id/input_layout_password"
+ android:checked="true"
+ android:text="@string/keeplogin"/>
+
+ <Button
+ android:id="@+id/bLogin"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="Login"
+ android:layout_marginTop="20dp"
+ android:layout_below="@id/cbRemember"/>
+
+</RelativeLayout>
\ No newline at end of file
[04/50] [abbrv] incubator-taverna-mobile git commit: workflow add to
player done
Posted by ia...@apache.org.
workflow add to player done
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/fcd4dff5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/fcd4dff5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/fcd4dff5
Branch: refs/heads/master
Commit: fcd4dff549d41093a7688f4519ebb39b16dc7683
Parents: 3fd55f3
Author: Sagar <ku...@gmail.com>
Authored: Wed Aug 31 00:57:13 2016 +0530
Committer: Sagar <ku...@gmail.com>
Committed: Wed Aug 31 00:57:13 2016 +0530
----------------------------------------------------------------------
.../workflowdetail/WorkflowDetailPresenter.java | 94 ++++++++++++++++++++
1 file changed, 94 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/fcd4dff5/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailPresenter.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailPresenter.java b/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailPresenter.java
index 0850e96..4d413b8 100644
--- a/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailPresenter.java
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailPresenter.java
@@ -18,17 +18,28 @@
*/
package org.apache.taverna.mobile.ui.workflowdetail;
+import android.util.Base64;
+import android.util.Log;
+
import org.apache.taverna.mobile.data.DataManager;
import org.apache.taverna.mobile.data.model.License;
import org.apache.taverna.mobile.data.model.User;
import org.apache.taverna.mobile.data.model.Workflow;
import org.apache.taverna.mobile.ui.base.BasePresenter;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
import java.util.HashMap;
import java.util.Map;
+import okhttp3.MediaType;
+import okhttp3.RequestBody;
+import okhttp3.ResponseBody;
+import rx.Observable;
import rx.Observer;
import rx.android.schedulers.AndroidSchedulers;
+import rx.functions.Func1;
import rx.schedulers.Schedulers;
import rx.subscriptions.CompositeSubscription;
@@ -192,6 +203,89 @@ public class WorkflowDetailPresenter extends BasePresenter<WorkflowDetailMvpView
}));
}
+ public void runWorkflow(String contentURL) {
+
+ mCompositeSubscription.add(mDataManager.downloadWorkflowContent("http://www.myexperiment" +
+ ".org/workflows/828/download/Pipelined_list_iteration-v.t2flow")
+ .concatMap(new Func1<ResponseBody, Observable<ResponseBody>>() {
+ @Override
+ public Observable<ResponseBody> call(ResponseBody responseBody) {
+
+ StringBuffer sb = new StringBuffer();
+ String post = "";
+ String user = "email" + ":" + "password";
+ String basicAuth = "Basic " + Base64.encodeToString(user.getBytes(),
+ Base64.DEFAULT);
+ boolean flag = false;
+ try {
+
+ BufferedReader bufferedReader = new BufferedReader(
+ new InputStreamReader(responseBody.byteStream()));
+
+ String str = "";
+
+ while ((str = bufferedReader.readLine()) != null)
+ sb.append(str);
+
+ bufferedReader.close();
+
+ String data = "{\"document\":\"data:application/octet-stream;base64," +
+ Base64.encodeToString(sb.toString().getBytes("UTF-8"), Base64
+ .URL_SAFE | Base64.NO_WRAP).replace('-', '+') + "\"}";
+
+ post = "{\"workflow\":" + data + "}";
+ flag = true;
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ if (flag) {
+ RequestBody body =
+ RequestBody.create(MediaType.parse("application/json"), post);
+
+ return mDataManager.uploadWorkflowContent(body, basicAuth.trim());
+ } else {
+ return Observable.empty();
+ }
+
+
+ }
+ })
+ .observeOn(AndroidSchedulers.mainThread())
+ .subscribeOn(Schedulers.io())
+ .subscribe(new Observer<ResponseBody>() {
+ @Override
+ public void onCompleted() {
+
+ }
+
+ @Override
+ public void onError(Throwable e) {
+ Log.e(LOG_TAG, "onError: ", e);
+ }
+
+ @Override
+ public void onNext(ResponseBody responseBody) {
+ StringBuffer sb = new StringBuffer();
+ try {
+
+ BufferedReader bufferedReader = new BufferedReader(
+ new InputStreamReader(responseBody.byteStream()));
+
+ String str = "";
+
+ while ((str = bufferedReader.readLine()) != null)
+ sb.append(str);
+
+
+ bufferedReader.close();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ Log.e("TAG", "onNext: " + sb.toString());
+ }
+ }));
+ }
+
private Map<String, String> getDetailQueryOptions() {
Map<String, String> option = new HashMap<>();
[12/50] [abbrv] incubator-taverna-mobile git commit: add player login
credential function in PreferenceHelper
Posted by ia...@apache.org.
add player login credential function in PreferenceHelper
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/45e7b38f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/45e7b38f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/45e7b38f
Branch: refs/heads/master
Commit: 45e7b38f3005d3462ef39a0c7324917e98382224
Parents: 3592433
Author: Sagar <ku...@gmail.com>
Authored: Sat Sep 24 11:40:09 2016 +0530
Committer: Sagar <ku...@gmail.com>
Committed: Sat Sep 24 11:40:09 2016 +0530
----------------------------------------------------------------------
.../taverna/mobile/data/local/PreferencesHelper.java | 14 ++++++++++++++
1 file changed, 14 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/45e7b38f/app/src/main/java/org/apache/taverna/mobile/data/local/PreferencesHelper.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/data/local/PreferencesHelper.java b/app/src/main/java/org/apache/taverna/mobile/data/local/PreferencesHelper.java
index 4e882b9..1d7d679 100644
--- a/app/src/main/java/org/apache/taverna/mobile/data/local/PreferencesHelper.java
+++ b/app/src/main/java/org/apache/taverna/mobile/data/local/PreferencesHelper.java
@@ -31,6 +31,8 @@ public class PreferencesHelper {
public static final String PREF_FILE_NAME = "taverna_app_pref_file";
+ private static final String PREF_KEY_PLAYER_LOGGED_IN = "pref_player_logged_in";
+
private static final String PREF_KEY_LOGGED_IN = "pref_logged_in";
private static final String PREF_KEY_USER_ID = "pref_user_id";
@@ -49,6 +51,7 @@ public class PreferencesHelper {
private static final String PREF_KEY_USER_WEBSITE = "pref_user_website";
+ private static final String PREF_KEY_PLAYER_CREDENTIAL = "pref_player_credential";
private final SharedPreferences mPref;
@@ -169,4 +172,15 @@ public class PreferencesHelper {
}
+ public boolean isUserPlayerLoggedInFlag() {
+ return mPref.getBoolean(PREF_KEY_PLAYER_LOGGED_IN, false);
+ }
+
+ public void setUserPlayerLoggedInFlag(Boolean flag, String credential) {
+
+ mPref.edit().putBoolean(PREF_KEY_PLAYER_LOGGED_IN, flag).apply();
+
+ mPref.edit().putString(PREF_KEY_PLAYER_CREDENTIAL, credential).apply();
+ }
+
}
[36/50] [abbrv] incubator-taverna-mobile git commit: Merge branch
'master' into PlayerIntegration
Posted by ia...@apache.org.
Merge branch 'master' into PlayerIntegration
# Conflicts:
# app/src/main/java/org/apache/taverna/mobile/data/remote/APIEndPoint.java
# app/src/main/java/org/apache/taverna/mobile/data/remote/TavernaService.java
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/2bef77c5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/2bef77c5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/2bef77c5
Branch: refs/heads/master
Commit: 2bef77c51431e98efbd7f7e3bbaa91ab61652a68
Parents: c247d77 f4b64b1
Author: Sagar <ku...@gmail.com>
Authored: Mon Sep 26 15:47:58 2016 +0530
Committer: Sagar <ku...@gmail.com>
Committed: Mon Sep 26 15:47:58 2016 +0530
----------------------------------------------------------------------
.../WorkflowdetailFragmentTest.java | 25 +
.../activities/DashboardMainActivity.java | 14 +
.../apache/taverna/mobile/data/DataManager.java | 4 +
.../apache/taverna/mobile/data/model/User.java | 30 +-
.../taverna/mobile/data/model/Workflow.java | 10 +-
.../taverna/mobile/data/remote/APIEndPoint.java | 5 +-
.../mobile/data/remote/TavernaService.java | 6 +
.../mobile/fragments/WorkflowViewpager.java | 25 +
.../fragments/workflowdetails/RunFragment.java | 25 +
.../taverna/mobile/tavernamobile/Runs.java | 25 +
.../ui/adapter/FavouriteWorkflowsAdapter.java | 25 +
.../mobile/ui/adapter/WorkflowAdapter.java | 25 +
.../ui/myworkflows/MyWorkflowFragment.java | 203 +
.../ui/myworkflows/MyWorkflowMvpView.java | 34 +
.../ui/myworkflows/MyWorkflowPresenter.java | 126 +
.../workflowdetail/WorkflowDetailPresenter.java | 7 +
.../apache/taverna/mobile/utils/RunTask.java | 25 +
.../mobile/utils/WorkflowDataCallback.java | 25 +
.../taverna/mobile/utils/WorkflowOpen.java | 25 +
.../mobile/utils/xmlparsers/WorkflowParser.java | 25 +
app/src/main/res/anim/zoomin.xml | 24 +
app/src/main/res/anim/zoomout.xml | 24 +
app/src/main/res/drawable/round_shape.xml | 24 +
app/src/main/res/layout/activity_run_result.xml | 24 +
app/src/main/res/layout/fragment_dashboard.xml | 9 +
app/src/main/res/layout/fragment_run_result.xml | 25 +-
app/src/main/res/layout/usage_layout.xml | 24 +
app/src/main/res/menu/drawer_view.xml | 7 +-
app/src/main/res/menu/run_result.xml | 24 +
app/src/main/res/values/strings.xml | 2 +
.../res/values/strings_activity_settings.xml | 24 +
app/src/main/res/xml/pref_general.xml | 24 +
app/src/main/res/xml/pref_headers.xml | 24 +
build.gradle | 8 +-
projectFilesBackup/.idea/workspace.xml | 3587 ++++++++++++++++++
35 files changed, 4524 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/2bef77c5/app/src/main/java/org/apache/taverna/mobile/data/DataManager.java
----------------------------------------------------------------------
diff --cc app/src/main/java/org/apache/taverna/mobile/data/DataManager.java
index 5444976,534b903..5171763
--- a/app/src/main/java/org/apache/taverna/mobile/data/DataManager.java
+++ b/app/src/main/java/org/apache/taverna/mobile/data/DataManager.java
@@@ -169,44 -166,8 +170,47 @@@ public class DataManager
});
}
+ /**
+ * @param url is Workflow's content xml URL
+ * @return OkHTTP ResponseBody of download file
+ */
+ public Observable<ResponseBody> downloadWorkflowContent(String url) {
+ return mBaseApiManager.getTavernaApi().downloadWorkflowContent(url);
+ }
+
+ /**
+ * @param body is body of upload workflow's detail
+ * @param baseAuth is base64 encoded credential
+ * @return Workflow's ID
+ */
+ public Observable<PlayerWorkflow> uploadWorkflowContent(RequestBody body, String baseAuth) {
+ return mBaseApiManager.getTavernaPlayerApi().uploadWorkflow(body, baseAuth);
+ }
+
+ /**
+ * @param credentials is base64 encoded credential
+ * @param flagLogin is used to maintain the Remain login or not
+ * @return okHTTP ResponseBody
+ */
+
+ public Observable<ResponseBody> authPlayerUserLoginDetail(final String credentials,
+ final boolean flagLogin) {
+ return mBaseApiManager.getTavernaPlayerApi().playerlogin(credentials)
+ .concatMap(new Func1<ResponseBody, Observable<? extends ResponseBody>>() {
+ @Override
+ public Observable<? extends ResponseBody> call(ResponseBody responseBody) {
+
+ return Observable.just(responseBody);
+ }
+ });
+
+ }
+
+ public Observable<PlayerWorkflowDetail> getWorkflowDetail(int id) {
+ return mBaseApiManager.getTavernaPlayerApi().getWorkflowDetail(id);
+ }
+ public Observable<User> getMyWorkflows(String userID, Map<String, String> options) {
+ return mBaseApiManager.getTavernaApi().getUserDetail(userID , options);
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/2bef77c5/app/src/main/java/org/apache/taverna/mobile/data/remote/APIEndPoint.java
----------------------------------------------------------------------
diff --cc app/src/main/java/org/apache/taverna/mobile/data/remote/APIEndPoint.java
index cf0511b,86a859b..b57436a
--- a/app/src/main/java/org/apache/taverna/mobile/data/remote/APIEndPoint.java
+++ b/app/src/main/java/org/apache/taverna/mobile/data/remote/APIEndPoint.java
@@@ -28,11 -28,6 +28,14 @@@ public class APIEndPoint
public static final String WORKFLOW = "workflow.xml";
public static final String USER = "user.xml";
public static final String LICENSE = "license.xml";
-
public static final String WHOAMI = "whoami.xml";
+
++
+ public static final String XML_ACCEPT_HEADER = "Accept: application/xml";
+ public static final String JSON_ACCEPT_HEADER = "Accept: application/json";
+ public static final String JSON_CONTENT_HEADER = "Content-Type: application/json";
+ public static final String UTF_CONTENT_ENCODING_HEADER = "Content-Encoding: UTF-8";
++
+ public static final String MY_WORKFLOWS = "user.xml";
++
}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/2bef77c5/app/src/main/java/org/apache/taverna/mobile/data/remote/TavernaService.java
----------------------------------------------------------------------
diff --cc app/src/main/java/org/apache/taverna/mobile/data/remote/TavernaService.java
index 943f1dc,8d609c6..c1aed26
--- a/app/src/main/java/org/apache/taverna/mobile/data/remote/TavernaService.java
+++ b/app/src/main/java/org/apache/taverna/mobile/data/remote/TavernaService.java
@@@ -63,8 -60,7 +63,14 @@@ public interface TavernaService
@GET(APIEndPoint.WHOAMI)
Observable<User> getLoginUserDetail(@Header("Authorization") String credentials);
++
+ @GET
+ @Headers(APIEndPoint.XML_ACCEPT_HEADER)
+ Observable<ResponseBody> downloadWorkflowContent(@Url String workflowContentUrl);
+
++
+ @GET(APIEndPoint.MY_WORKFLOWS)
+ Observable<Workflows> getMyWorkflows(@Query("id") String id,
+ @QueryMap Map<String, String> options);
++
}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/2bef77c5/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailPresenter.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/2bef77c5/app/src/main/res/layout/fragment_run_result.xml
----------------------------------------------------------------------
diff --cc app/src/main/res/layout/fragment_run_result.xml
index 78b3a0d,20728d7..676c307
--- a/app/src/main/res/layout/fragment_run_result.xml
+++ b/app/src/main/res/layout/fragment_run_result.xml
@@@ -4,7 -28,7 +28,6 @@@
android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin"
android:paddingBottom="@dimen/activity_vertical_margin"
-- tools:context="org.apache.taverna.mobile.activities.RunResult$PlaceholderFragment"
android:orientation="vertical"
>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/2bef77c5/build.gradle
----------------------------------------------------------------------
diff --cc build.gradle
index fda2b59,7df1c68..a67b30d
--- a/build.gradle
+++ b/build.gradle
@@@ -4,11 -4,12 +4,12 @@@ buildscript
repositories {
jcenter()
mavenCentral()
+ maven { url "https://plugins.gradle.org/m2/" }
}
dependencies {
- classpath 'com.android.tools.build:gradle:2.1.2'
+ classpath 'com.android.tools.build:gradle:2.2.0'
classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
-
+ classpath "gradle.plugin.org.nosphere.apache:creadur-rat-gradle:0.2.1"
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
}
[30/50] [abbrv] incubator-taverna-mobile git commit: add error method
Posted by ia...@apache.org.
add error method
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/7eb4d3a2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/7eb4d3a2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/7eb4d3a2
Branch: refs/heads/master
Commit: 7eb4d3a2d9b659fa8406cf6f554ed76a89099008
Parents: 1600e7b
Author: Sagar <ku...@gmail.com>
Authored: Mon Sep 26 14:57:00 2016 +0530
Committer: Sagar <ku...@gmail.com>
Committed: Mon Sep 26 14:57:00 2016 +0530
----------------------------------------------------------------------
.../taverna/mobile/ui/workflowrun/WorkflowRunActivity.java | 8 ++++++++
.../taverna/mobile/ui/workflowrun/WorkflowRunMvpView.java | 2 ++
.../taverna/mobile/ui/workflowrun/WorkflowRunPresenter.java | 4 ++--
3 files changed, 12 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/7eb4d3a2/app/src/main/java/org/apache/taverna/mobile/ui/workflowrun/WorkflowRunActivity.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/workflowrun/WorkflowRunActivity.java b/app/src/main/java/org/apache/taverna/mobile/ui/workflowrun/WorkflowRunActivity.java
index 0ba0e1f..aa1f06d 100644
--- a/app/src/main/java/org/apache/taverna/mobile/ui/workflowrun/WorkflowRunActivity.java
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/workflowrun/WorkflowRunActivity.java
@@ -26,6 +26,7 @@ import android.support.v4.app.FragmentActivity;
import android.support.v4.app.FragmentManager;
import android.support.v4.app.FragmentStatePagerAdapter;
import android.support.v4.view.PagerAdapter;
+import android.widget.Toast;
import com.anton46.stepsview.StepsView;
@@ -140,6 +141,13 @@ public class WorkflowRunActivity extends FragmentActivity implements WorkflowRun
mPager.getAdapter().notifyDataSetChanged();
}
+ @Override
+ public void showError() {
+ Toast.makeText(this, "Server Error. Please try after sometime", Toast
+ .LENGTH_LONG).show();
+ finish();
+ }
+
private class ScreenSlidePagerAdapter extends FragmentStatePagerAdapter {
public ScreenSlidePagerAdapter(FragmentManager fm) {
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/7eb4d3a2/app/src/main/java/org/apache/taverna/mobile/ui/workflowrun/WorkflowRunMvpView.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/workflowrun/WorkflowRunMvpView.java b/app/src/main/java/org/apache/taverna/mobile/ui/workflowrun/WorkflowRunMvpView.java
index 727cb38..c0ab80e 100644
--- a/app/src/main/java/org/apache/taverna/mobile/ui/workflowrun/WorkflowRunMvpView.java
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/workflowrun/WorkflowRunMvpView.java
@@ -10,4 +10,6 @@ public interface WorkflowRunMvpView extends MvpView {
void movetoInputs();
void setInputsAttribute(int id);
+
+ void showError();
}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/7eb4d3a2/app/src/main/java/org/apache/taverna/mobile/ui/workflowrun/WorkflowRunPresenter.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/workflowrun/WorkflowRunPresenter.java b/app/src/main/java/org/apache/taverna/mobile/ui/workflowrun/WorkflowRunPresenter.java
index 48e6310..ef5686d 100644
--- a/app/src/main/java/org/apache/taverna/mobile/ui/workflowrun/WorkflowRunPresenter.java
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/workflowrun/WorkflowRunPresenter.java
@@ -20,7 +20,6 @@ package org.apache.taverna.mobile.ui.workflowrun;
import android.util.Base64;
-import android.util.Log;
import org.apache.taverna.mobile.data.DataManager;
import org.apache.taverna.mobile.data.model.PlayerWorkflow;
@@ -130,7 +129,8 @@ public class WorkflowRunPresenter extends BasePresenter<WorkflowRunMvpView> {
@Override
public void onError(Throwable e) {
- Log.e("TAG", "onError: ", e);
+
+ getMvpView().showError();
}
@Override
[37/50] [abbrv] incubator-taverna-mobile git commit: add getContext
method
Posted by ia...@apache.org.
add getContext method
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/b95c3846
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/b95c3846
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/b95c3846
Branch: refs/heads/master
Commit: b95c38460b36cd7d72371b42c45a35fcd5c97594
Parents: 2bef77c
Author: Sagar <ku...@gmail.com>
Authored: Tue Sep 27 14:10:37 2016 +0530
Committer: Sagar <ku...@gmail.com>
Committed: Tue Sep 27 14:10:37 2016 +0530
----------------------------------------------------------------------
.../org/apache/taverna/mobile/TavernaApplication.java | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/b95c3846/app/src/main/java/org/apache/taverna/mobile/TavernaApplication.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/TavernaApplication.java b/app/src/main/java/org/apache/taverna/mobile/TavernaApplication.java
index d727718..13d8280 100644
--- a/app/src/main/java/org/apache/taverna/mobile/TavernaApplication.java
+++ b/app/src/main/java/org/apache/taverna/mobile/TavernaApplication.java
@@ -19,18 +19,26 @@
package org.apache.taverna.mobile;
+import android.app.Application;
+import android.content.Context;
+
import com.facebook.stetho.Stetho;
import com.raizlabs.android.dbflow.config.FlowConfig;
import com.raizlabs.android.dbflow.config.FlowManager;
-import android.app.Application;
-
public class TavernaApplication extends Application {
+ private static TavernaApplication instance;
+
+ public static Context getContext() {
+ return instance;
+ }
+
@Override
public void onCreate() {
super.onCreate();
+ instance = this;
FlowManager.init(new FlowConfig.Builder(this).build());
Stetho.initializeWithDefaults(this);
[46/50] [abbrv] incubator-taverna-mobile git commit: change player
email hint
Posted by ia...@apache.org.
change player email hint
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/e1c3b341
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/e1c3b341
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/e1c3b341
Branch: refs/heads/master
Commit: e1c3b3416cf2721932c0b29faa21558269ea3533
Parents: 6548591
Author: Sagar <ku...@gmail.com>
Authored: Wed Sep 28 16:00:54 2016 +0530
Committer: Sagar <ku...@gmail.com>
Committed: Wed Sep 28 16:00:54 2016 +0530
----------------------------------------------------------------------
app/src/main/res/layout/fragment_player_login_layout.xml | 2 +-
app/src/main/res/values/strings.xml | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/e1c3b341/app/src/main/res/layout/fragment_player_login_layout.xml
----------------------------------------------------------------------
diff --git a/app/src/main/res/layout/fragment_player_login_layout.xml b/app/src/main/res/layout/fragment_player_login_layout.xml
index a6fbb9e..ea87d99 100644
--- a/app/src/main/res/layout/fragment_player_login_layout.xml
+++ b/app/src/main/res/layout/fragment_player_login_layout.xml
@@ -44,7 +44,7 @@ limitations under the License.
android:id="@+id/etEmail"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:hint="@string/hint_email"
+ android:hint="@string/hint_email_player"
android:inputType="textEmailAddress"
android:singleLine="true"/>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/e1c3b341/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 f2a2a20..fea986f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -115,6 +115,7 @@ limitations under the License.
<string name="no_favourite_workflow_found">No Favourite Workflow Found!!!</string>
<string name="image_zoom">Image Zoom</string>
<string name="hint_email">Email or Username</string>
+ <string name="hint_email_player">Email</string>
<string name="hint_password">Password</string>
<string name="login_button_description">Login Button</string>
<string name="err_login_email">Enter valid email</string>
[13/50] [abbrv] incubator-taverna-mobile git commit: update gradle
Posted by ia...@apache.org.
update gradle
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/0f48388d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/0f48388d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/0f48388d
Branch: refs/heads/master
Commit: 0f48388d8bcfbe6063330dc4bb3b8755b9b367af
Parents: 45e7b38
Author: Sagar <ku...@gmail.com>
Authored: Sat Sep 24 14:53:56 2016 +0530
Committer: Sagar <ku...@gmail.com>
Committed: Sat Sep 24 14:53:56 2016 +0530
----------------------------------------------------------------------
build.gradle | 2 +-
gradle/wrapper/gradle-wrapper.properties | 5 ++---
2 files changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/0f48388d/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index 51ff6b9..fda2b59 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
mavenCentral()
}
dependencies {
- classpath 'com.android.tools.build:gradle:2.1.2'
+ classpath 'com.android.tools.build:gradle:2.2.0'
classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
// NOTE: Do not place your application dependencies here; they belong
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/0f48388d/gradle/wrapper/gradle-wrapper.properties
----------------------------------------------------------------------
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index f13e8da..620ab85 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,6 @@
-#Mon Jun 13 14:56:44 IST 2016
-#Fri Jun 10 16:01:58 GMT+05:30 2016
+#Sat Sep 24 14:50:13 IST 2016
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
[45/50] [abbrv] incubator-taverna-mobile git commit: remove fragment
back stack error
Posted by ia...@apache.org.
remove fragment back stack error
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/6548591c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/6548591c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/6548591c
Branch: refs/heads/master
Commit: 6548591c0f19002998f55659192299bf9ee2dc5c
Parents: 0f9b09b
Author: Sagar <ku...@gmail.com>
Authored: Wed Sep 28 15:56:06 2016 +0530
Committer: Sagar <ku...@gmail.com>
Committed: Wed Sep 28 15:56:06 2016 +0530
----------------------------------------------------------------------
.../main/java/org/apache/taverna/mobile/utils/ActivityUtils.java | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/6548591c/app/src/main/java/org/apache/taverna/mobile/utils/ActivityUtils.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/utils/ActivityUtils.java b/app/src/main/java/org/apache/taverna/mobile/utils/ActivityUtils.java
index c7f68f5..6cbf7b9 100644
--- a/app/src/main/java/org/apache/taverna/mobile/utils/ActivityUtils.java
+++ b/app/src/main/java/org/apache/taverna/mobile/utils/ActivityUtils.java
@@ -27,6 +27,10 @@ public class ActivityUtils {
public static void addFragmentToActivity (FragmentManager fragmentManager,
Fragment fragment, int frameId) {
+
+ for(int i = 0; i < fragmentManager.getBackStackEntryCount(); ++i) {
+ fragmentManager.popBackStack();
+ }
FragmentTransaction transaction = fragmentManager.beginTransaction();
transaction.replace(frameId, fragment);
transaction.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_CLOSE);
[09/50] [abbrv] incubator-taverna-mobile git commit: add gson and
retrofit json converter library
Posted by ia...@apache.org.
add gson and retrofit json converter library
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/ee9448cd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/ee9448cd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/ee9448cd
Branch: refs/heads/master
Commit: ee9448cd2a7487262efa5b5525aa7fddcfc1471e
Parents: c70f85d
Author: Sagar <ku...@gmail.com>
Authored: Sat Sep 24 11:20:01 2016 +0530
Committer: Sagar <ku...@gmail.com>
Committed: Sat Sep 24 11:20:01 2016 +0530
----------------------------------------------------------------------
app/build.gradle | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/ee9448cd/app/build.gradle
----------------------------------------------------------------------
diff --git a/app/build.gradle b/app/build.gradle
index 563fce6..f75ca9c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -76,4 +76,7 @@ dependencies {
compile 'com.github.chrisbanes:PhotoView:1.2.6'
compile 'com.android.support:multidex:1.0.0'
+ compile 'com.google.code.gson:gson:2.7'
+ compile 'com.squareup.retrofit2:converter-gson:2.0.2'
+
}
[28/50] [abbrv] incubator-taverna-mobile git commit: add workflow run
view
Posted by ia...@apache.org.
add workflow run 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/67035fa6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/67035fa6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/67035fa6
Branch: refs/heads/master
Commit: 67035fa695404194166dd5d5abb714c44cb57fb8
Parents: 8c1c5bf
Author: Sagar <ku...@gmail.com>
Authored: Mon Sep 26 14:37:33 2016 +0530
Committer: Sagar <ku...@gmail.com>
Committed: Mon Sep 26 14:37:33 2016 +0530
----------------------------------------------------------------------
.../main/res/layout/activity_workflow_run.xml | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/67035fa6/app/src/main/res/layout/activity_workflow_run.xml
----------------------------------------------------------------------
diff --git a/app/src/main/res/layout/activity_workflow_run.xml b/app/src/main/res/layout/activity_workflow_run.xml
new file mode 100644
index 0000000..77460be
--- /dev/null
+++ b/app/src/main/res/layout/activity_workflow_run.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="vertical">
+
+ <com.anton46.stepsview.StepsView
+ android:id="@+id/stepsView"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ />
+
+ <org.apache.taverna.mobile.utils.NonSwipeableViewPager
+ android:id="@+id/viewpager"
+ android:layout_width="match_parent"
+ android:layout_height="0dp"
+ android:layout_weight="1"/>
+
+
+</LinearLayout>
\ No newline at end of file
[39/50] [abbrv] incubator-taverna-mobile git commit: add log tag
Posted by ia...@apache.org.
add log tag
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/03ab1567
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/03ab1567
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/03ab1567
Branch: refs/heads/master
Commit: 03ab1567c20678b37d0fb43c765d4daf9f2e9878
Parents: 7df97f4
Author: Sagar <ku...@gmail.com>
Authored: Tue Sep 27 14:26:24 2016 +0530
Committer: Sagar <ku...@gmail.com>
Committed: Tue Sep 27 14:26:24 2016 +0530
----------------------------------------------------------------------
.../taverna/mobile/ui/playerlogin/PlayerLoginPresenter.java | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/03ab1567/app/src/main/java/org/apache/taverna/mobile/ui/playerlogin/PlayerLoginPresenter.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/playerlogin/PlayerLoginPresenter.java b/app/src/main/java/org/apache/taverna/mobile/ui/playerlogin/PlayerLoginPresenter.java
index 26a5c28..b75e9f8 100644
--- a/app/src/main/java/org/apache/taverna/mobile/ui/playerlogin/PlayerLoginPresenter.java
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/playerlogin/PlayerLoginPresenter.java
@@ -34,6 +34,8 @@ import rx.schedulers.Schedulers;
public class PlayerLoginPresenter extends BasePresenter<PlayerLoginMvpView> {
+ private static final String TAG = PlayerLoginPresenter.class.getSimpleName();
+
private DataManager mDataManager;
private Subscription mSubscriptions;
@@ -68,7 +70,7 @@ public class PlayerLoginPresenter extends BasePresenter<PlayerLoginMvpView> {
@Override
public void onError(Throwable e) {
- Log.e("TAG", "onError: ", e);
+ Log.e(TAG, "onError: ", e);
if (e instanceof HttpException) {
if (((HttpException) e).code() == 401) {
getMvpView().showCredentialError();
@@ -77,13 +79,15 @@ public class PlayerLoginPresenter extends BasePresenter<PlayerLoginMvpView> {
mDataManager.getPreferencesHelper().setUserPlayerLoggedInFlag
(loginFlag, getEncodedCredential(username, password));
+ } else {
+ getMvpView().showError("Server Error");
}
}
}
@Override
public void onNext(ResponseBody responseBody) {
- Log.e("hello", "onCompleted: " + responseBody.byteStream());
+ Log.e(TAG, "onCompleted: " + responseBody.byteStream());
}
});
[23/50] [abbrv] incubator-taverna-mobile git commit: remove unused
method
Posted by ia...@apache.org.
remove unused method
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/adeb5df6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/adeb5df6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/adeb5df6
Branch: refs/heads/master
Commit: adeb5df6c48bd5d2bb2ac77066775011f5c84853
Parents: f887f45
Author: Sagar <ku...@gmail.com>
Authored: Sun Sep 25 21:56:22 2016 +0530
Committer: Sagar <ku...@gmail.com>
Committed: Sun Sep 25 21:56:22 2016 +0530
----------------------------------------------------------------------
.../workflowdetail/WorkflowDetailPresenter.java | 93 --------------------
1 file changed, 93 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/adeb5df6/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailPresenter.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailPresenter.java b/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailPresenter.java
index 4d413b8..d8e33f5 100644
--- a/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailPresenter.java
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailPresenter.java
@@ -18,28 +18,17 @@
*/
package org.apache.taverna.mobile.ui.workflowdetail;
-import android.util.Base64;
-import android.util.Log;
-
import org.apache.taverna.mobile.data.DataManager;
import org.apache.taverna.mobile.data.model.License;
import org.apache.taverna.mobile.data.model.User;
import org.apache.taverna.mobile.data.model.Workflow;
import org.apache.taverna.mobile.ui.base.BasePresenter;
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
import java.util.HashMap;
import java.util.Map;
-import okhttp3.MediaType;
-import okhttp3.RequestBody;
-import okhttp3.ResponseBody;
-import rx.Observable;
import rx.Observer;
import rx.android.schedulers.AndroidSchedulers;
-import rx.functions.Func1;
import rx.schedulers.Schedulers;
import rx.subscriptions.CompositeSubscription;
@@ -203,88 +192,6 @@ public class WorkflowDetailPresenter extends BasePresenter<WorkflowDetailMvpView
}));
}
- public void runWorkflow(String contentURL) {
-
- mCompositeSubscription.add(mDataManager.downloadWorkflowContent("http://www.myexperiment" +
- ".org/workflows/828/download/Pipelined_list_iteration-v.t2flow")
- .concatMap(new Func1<ResponseBody, Observable<ResponseBody>>() {
- @Override
- public Observable<ResponseBody> call(ResponseBody responseBody) {
-
- StringBuffer sb = new StringBuffer();
- String post = "";
- String user = "email" + ":" + "password";
- String basicAuth = "Basic " + Base64.encodeToString(user.getBytes(),
- Base64.DEFAULT);
- boolean flag = false;
- try {
-
- BufferedReader bufferedReader = new BufferedReader(
- new InputStreamReader(responseBody.byteStream()));
-
- String str = "";
-
- while ((str = bufferedReader.readLine()) != null)
- sb.append(str);
-
- bufferedReader.close();
-
- String data = "{\"document\":\"data:application/octet-stream;base64," +
- Base64.encodeToString(sb.toString().getBytes("UTF-8"), Base64
- .URL_SAFE | Base64.NO_WRAP).replace('-', '+') + "\"}";
-
- post = "{\"workflow\":" + data + "}";
- flag = true;
- } catch (IOException e) {
- e.printStackTrace();
- }
- if (flag) {
- RequestBody body =
- RequestBody.create(MediaType.parse("application/json"), post);
-
- return mDataManager.uploadWorkflowContent(body, basicAuth.trim());
- } else {
- return Observable.empty();
- }
-
-
- }
- })
- .observeOn(AndroidSchedulers.mainThread())
- .subscribeOn(Schedulers.io())
- .subscribe(new Observer<ResponseBody>() {
- @Override
- public void onCompleted() {
-
- }
-
- @Override
- public void onError(Throwable e) {
- Log.e(LOG_TAG, "onError: ", e);
- }
-
- @Override
- public void onNext(ResponseBody responseBody) {
- StringBuffer sb = new StringBuffer();
- try {
-
- BufferedReader bufferedReader = new BufferedReader(
- new InputStreamReader(responseBody.byteStream()));
-
- String str = "";
-
- while ((str = bufferedReader.readLine()) != null)
- sb.append(str);
-
-
- bufferedReader.close();
- } catch (IOException e) {
- e.printStackTrace();
- }
- Log.e("TAG", "onNext: " + sb.toString());
- }
- }));
- }
private Map<String, String> getDetailQueryOptions() {
[18/50] [abbrv] incubator-taverna-mobile git commit: add methods in
player service
Posted by ia...@apache.org.
add methods in player service
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/d16d467d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/d16d467d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/d16d467d
Branch: refs/heads/master
Commit: d16d467d4b4b4954e45e40edee65d9dd8ed53418
Parents: 6f6a98a
Author: Sagar <ku...@gmail.com>
Authored: Sun Sep 25 21:53:30 2016 +0530
Committer: Sagar <ku...@gmail.com>
Committed: Sun Sep 25 21:53:30 2016 +0530
----------------------------------------------------------------------
.../data/remote/TavernaPlayerService.java | 20 +++++++++++++++++++-
1 file changed, 19 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/d16d467d/app/src/main/java/org/apache/taverna/mobile/data/remote/TavernaPlayerService.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/data/remote/TavernaPlayerService.java b/app/src/main/java/org/apache/taverna/mobile/data/remote/TavernaPlayerService.java
index 819456e..3ad89dd 100644
--- a/app/src/main/java/org/apache/taverna/mobile/data/remote/TavernaPlayerService.java
+++ b/app/src/main/java/org/apache/taverna/mobile/data/remote/TavernaPlayerService.java
@@ -1,12 +1,17 @@
package org.apache.taverna.mobile.data.remote;
+import org.apache.taverna.mobile.data.model.PlayerWorkflow;
+import org.apache.taverna.mobile.data.model.PlayerWorkflowDetail;
+
import okhttp3.RequestBody;
import okhttp3.ResponseBody;
import retrofit2.http.Body;
+import retrofit2.http.GET;
import retrofit2.http.Header;
import retrofit2.http.Headers;
import retrofit2.http.POST;
+import retrofit2.http.Query;
import rx.Observable;
public interface TavernaPlayerService {
@@ -14,8 +19,21 @@ public interface TavernaPlayerService {
@POST("/workflows.json")
@Headers({
APIEndPoint.JSON_CONTENT_HEADER,
+ APIEndPoint.JSON_ACCEPT_HEADER,
APIEndPoint.UTF_CONTENT_ENCODING_HEADER})
- Observable<ResponseBody> uploadWorkflow(@Body RequestBody body, @Header("Authorization") String
+ Observable<PlayerWorkflow> uploadWorkflow(@Body RequestBody body, @Header("Authorization") String
authorization);
+ @POST("/users/sign_in")
+ @Headers({
+ APIEndPoint.XML_ACCEPT_HEADER})
+ Observable<ResponseBody> playerlogin(@Header("Authorization") String
+ authorization);
+
+
+ @GET("/runs/new")
+ @Headers({
+ APIEndPoint.JSON_CONTENT_HEADER,
+ APIEndPoint.JSON_ACCEPT_HEADER})
+ Observable<PlayerWorkflowDetail> getWorkflowDetail(@Query("workflow_id") int id);
}
[44/50] [abbrv] incubator-taverna-mobile git commit: remove run t2
workflow fab button for non t2 workflow
Posted by ia...@apache.org.
remove run t2 workflow fab button for non t2 workflow
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/0f9b09be
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/0f9b09be
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/0f9b09be
Branch: refs/heads/master
Commit: 0f9b09be83c7a602c7fd2995a84ebfafa0bf45fe
Parents: fc036a7
Author: Sagar <ku...@gmail.com>
Authored: Wed Sep 28 15:48:21 2016 +0530
Committer: Sagar <ku...@gmail.com>
Committed: Wed Sep 28 15:48:21 2016 +0530
----------------------------------------------------------------------
.../FavouriteWorkflowDetailFragment.java | 10 ++++++++++
.../mobile/ui/workflowdetail/WorkflowDetailFragment.java | 9 +++++++++
app/src/main/res/layout/fragment_detail_workflow.xml | 1 +
3 files changed, 20 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/0f9b09be/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflowdetail/FavouriteWorkflowDetailFragment.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflowdetail/FavouriteWorkflowDetailFragment.java b/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflowdetail/FavouriteWorkflowDetailFragment.java
index be40d46..c3494ff 100644
--- a/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflowdetail/FavouriteWorkflowDetailFragment.java
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflowdetail/FavouriteWorkflowDetailFragment.java
@@ -23,6 +23,7 @@ import android.app.ProgressDialog;
import android.content.Intent;
import android.os.Bundle;
import android.support.annotation.Nullable;
+import android.support.design.widget.FloatingActionButton;
import android.support.design.widget.Snackbar;
import android.support.v4.app.Fragment;
import android.support.v7.app.ActionBar;
@@ -97,6 +98,9 @@ public class FavouriteWorkflowDetailFragment extends Fragment
@BindView(R.id.rootLayout)
RelativeLayout rootLayout;
+ @BindView(R.id.fabRun)
+ FloatingActionButton fabRun;
+
private AlertDialog alertDialog;
private DataManager dataManager;
@@ -246,6 +250,12 @@ public class FavouriteWorkflowDetailFragment extends Fragment
licenceId = workflow.getLicenseType().getId();
}
+ if (mWorkflow.getType().getContent().equals("Taverna 2")) {
+ fabRun.setVisibility(View.VISIBLE);
+ }else {
+ fabRun.setVisibility(View.GONE);
+ }
+
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/0f9b09be/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailFragment.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailFragment.java b/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailFragment.java
index aa90f3e..b435986 100644
--- a/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailFragment.java
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailFragment.java
@@ -23,6 +23,7 @@ import android.app.ProgressDialog;
import android.content.Intent;
import android.os.Bundle;
import android.support.annotation.Nullable;
+import android.support.design.widget.FloatingActionButton;
import android.support.design.widget.Snackbar;
import android.support.v4.app.Fragment;
import android.support.v7.app.AlertDialog;
@@ -97,6 +98,9 @@ public class WorkflowDetailFragment extends Fragment implements WorkflowDetailMv
@BindView(R.id.rootLayout)
RelativeLayout rootLayout;
+ @BindView(R.id.fabRun)
+ FloatingActionButton fabRun;
+
private AlertDialog alertDialog;
private DataManager dataManager;
@@ -252,6 +256,11 @@ public class WorkflowDetailFragment extends Fragment implements WorkflowDetailMv
licenceId = workflow.getLicenseType().getId();
}
+ if (mWorkflow.getType().getContent().equals("Taverna 2")) {
+ fabRun.setVisibility(View.VISIBLE);
+ }else {
+ fabRun.setVisibility(View.GONE);
+ }
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/0f9b09be/app/src/main/res/layout/fragment_detail_workflow.xml
----------------------------------------------------------------------
diff --git a/app/src/main/res/layout/fragment_detail_workflow.xml b/app/src/main/res/layout/fragment_detail_workflow.xml
index 0b5ff65..83348a4 100644
--- a/app/src/main/res/layout/fragment_detail_workflow.xml
+++ b/app/src/main/res/layout/fragment_detail_workflow.xml
@@ -153,6 +153,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom|end"
+ android:visibility="gone"
android:layout_margin="@dimen/fab_margin"
android:src="@drawable/ic_play_arrow_black_24dp"
/>
[49/50] [abbrv] incubator-taverna-mobile git commit: remove
checkstyle and pmd error
Posted by ia...@apache.org.
remove checkstyle and pmd error
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/c8da89a8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/c8da89a8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/c8da89a8
Branch: refs/heads/master
Commit: c8da89a879ce3e584d7514f0bdf98a623aaec92e
Parents: b1a458a
Author: Sagar <ku...@gmail.com>
Authored: Thu Sep 29 23:17:38 2016 +0530
Committer: Sagar <ku...@gmail.com>
Committed: Thu Sep 29 23:17:38 2016 +0530
----------------------------------------------------------------------
.../taverna/mobile/ui/DownloadingFragment.java | 7 +++----
.../FavouriteWorkflowDetailFragment.java | 9 +++++----
.../ui/workflowdetail/WorkflowDetailFragment.java | 3 ++-
.../mobile/ui/workflowrun/WorkflowRunActivity.java | 16 +++++++++-------
.../apache/taverna/mobile/utils/ActivityUtils.java | 6 +++---
.../org/apache/taverna/mobile/utils/Constants.java | 2 ++
6 files changed, 24 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/c8da89a8/app/src/main/java/org/apache/taverna/mobile/ui/DownloadingFragment.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/DownloadingFragment.java b/app/src/main/java/org/apache/taverna/mobile/ui/DownloadingFragment.java
index 3a44fb3..11c1300 100644
--- a/app/src/main/java/org/apache/taverna/mobile/ui/DownloadingFragment.java
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/DownloadingFragment.java
@@ -36,12 +36,11 @@ import butterknife.ButterKnife;
public class DownloadingFragment extends Fragment {
-
- private String message;
-
@BindView(R.id.tvMessage)
TextView tv_Message;
+ private String message;
+
public static DownloadingFragment newInstance(String message) {
Bundle args = new Bundle();
@@ -55,7 +54,7 @@ public class DownloadingFragment extends Fragment {
@Override
public void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- if(getArguments()!=null) {
+ if (getArguments() != null) {
message = getArguments().getString(Constants.ARGS_MESSAGE);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/c8da89a8/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflowdetail/FavouriteWorkflowDetailFragment.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflowdetail/FavouriteWorkflowDetailFragment.java b/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflowdetail/FavouriteWorkflowDetailFragment.java
index f217b6c..ae6fd1c 100644
--- a/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflowdetail/FavouriteWorkflowDetailFragment.java
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflowdetail/FavouriteWorkflowDetailFragment.java
@@ -54,6 +54,7 @@ import org.apache.taverna.mobile.ui.imagezoom.ImageZoomActivity;
import org.apache.taverna.mobile.ui.imagezoom.ImageZoomFragment;
import org.apache.taverna.mobile.ui.workflowrun.WorkflowRunActivity;
import org.apache.taverna.mobile.utils.ConnectionInfo;
+import org.apache.taverna.mobile.utils.Constants;
import butterknife.BindView;
import butterknife.ButterKnife;
@@ -179,9 +180,9 @@ public class FavouriteWorkflowDetailFragment extends Fragment
@OnClick(R.id.fabRun)
void fabClickRunWorkflow(View v) {
- Intent intent = new Intent(getActivity(), WorkflowRunActivity.class);
- intent.putExtra(WorkflowRunActivity.WORKFLOW_URL, mWorkflow.getContentUri());
- startActivity(intent);
+ Intent intent = new Intent(getActivity(), WorkflowRunActivity.class);
+ intent.putExtra(Constants.WORKFLOW_URL, mWorkflow.getContentUri());
+ startActivity(intent);
}
@OnClick(R.id.ivWorkflowImage)
@@ -261,7 +262,7 @@ public class FavouriteWorkflowDetailFragment extends Fragment
if (mWorkflow.getType().getContent().equals(getString(R.string.t2_workflow_type))) {
fabRun.setVisibility(View.VISIBLE);
- }else {
+ } else {
fabRun.setVisibility(View.GONE);
}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/c8da89a8/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailFragment.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailFragment.java b/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailFragment.java
index 094511e..f1f4a86 100644
--- a/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailFragment.java
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailFragment.java
@@ -53,6 +53,7 @@ import org.apache.taverna.mobile.ui.imagezoom.ImageZoomActivity;
import org.apache.taverna.mobile.ui.imagezoom.ImageZoomFragment;
import org.apache.taverna.mobile.ui.workflowrun.WorkflowRunActivity;
import org.apache.taverna.mobile.utils.ConnectionInfo;
+import org.apache.taverna.mobile.utils.Constants;
import butterknife.BindView;
import butterknife.ButterKnife;
@@ -175,7 +176,7 @@ public class WorkflowDetailFragment extends Fragment implements WorkflowDetailMv
void fabClickRunWorkflow(View v) {
Intent intent = new Intent(getActivity(), WorkflowRunActivity.class);
- intent.putExtra(WorkflowRunActivity.WORKFLOW_URL, mWorkflow.getContentUri());
+ intent.putExtra(Constants.WORKFLOW_URL, mWorkflow.getContentUri());
startActivity(intent);
}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/c8da89a8/app/src/main/java/org/apache/taverna/mobile/ui/workflowrun/WorkflowRunActivity.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/workflowrun/WorkflowRunActivity.java b/app/src/main/java/org/apache/taverna/mobile/ui/workflowrun/WorkflowRunActivity.java
index b96ce16..50febae 100644
--- a/app/src/main/java/org/apache/taverna/mobile/ui/workflowrun/WorkflowRunActivity.java
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/workflowrun/WorkflowRunActivity.java
@@ -35,6 +35,7 @@ import org.apache.taverna.mobile.data.DataManager;
import org.apache.taverna.mobile.data.local.PreferencesHelper;
import org.apache.taverna.mobile.ui.DownloadingFragment;
import org.apache.taverna.mobile.ui.playerlogin.PlayerLoginFragment;
+import org.apache.taverna.mobile.utils.Constants;
import org.apache.taverna.mobile.utils.NonSwipeableViewPager;
import org.apache.taverna.mobile.utils.WebViewGenerator;
@@ -46,9 +47,7 @@ import static com.raizlabs.android.dbflow.config.FlowManager.getContext;
public class WorkflowRunActivity extends FragmentActivity implements WorkflowRunMvpView,
PlayerLoginFragment.OnSuccessful {
- public static final String WORKFLOW_URL = "Workflow_url";
- private String[] labels;
@BindView(R.id.stepsView)
StepsView mStepsView;
@@ -58,6 +57,7 @@ public class WorkflowRunActivity extends FragmentActivity implements WorkflowRun
int position = 0;
+ private String[] labels;
private String workflowRunURL;
private DataManager dataManager;
@@ -80,7 +80,7 @@ public class WorkflowRunActivity extends FragmentActivity implements WorkflowRun
mWorkflowRunPresenter.attachView(this);
- labels=getResources().getStringArray(R.array.player_run_slider_view_labels);
+ labels = getResources().getStringArray(R.array.player_run_slider_view_labels);
mStepsView.setCompletedPosition(position % labels.length)
.setLabels(labels)
@@ -99,7 +99,7 @@ public class WorkflowRunActivity extends FragmentActivity implements WorkflowRun
mPager.setCurrentItem(++position);
mStepsView.setCompletedPosition(position % labels.length).drawView();
- mWorkflowRunPresenter.runWorkflow(getIntent().getStringExtra(WORKFLOW_URL));
+ mWorkflowRunPresenter.runWorkflow(getIntent().getStringExtra(Constants.WORKFLOW_URL));
}
}
@@ -116,7 +116,7 @@ public class WorkflowRunActivity extends FragmentActivity implements WorkflowRun
position = 1;
mPager.setCurrentItem(position);
mStepsView.setCompletedPosition(position % labels.length).drawView();
- mWorkflowRunPresenter.runWorkflow(getIntent().getStringExtra(WORKFLOW_URL));
+ mWorkflowRunPresenter.runWorkflow(getIntent().getStringExtra(Constants.WORKFLOW_URL));
}
@Override
@@ -165,9 +165,11 @@ public class WorkflowRunActivity extends FragmentActivity implements WorkflowRun
case 0:
return PlayerLoginFragment.newInstance();
case 1:
- return DownloadingFragment.newInstance(getString(R.string.downloading_workflow_lable));
+ return DownloadingFragment.newInstance(getString(R.string
+ .downloading_workflow_lable));
case 2:
- return DownloadingFragment.newInstance(getString(R.string.uploading_workflow_lable));
+ return DownloadingFragment.newInstance(getString(R.string
+ .uploading_workflow_lable));
default:
return WebViewGenerator.newInstance(workflowRunURL);
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/c8da89a8/app/src/main/java/org/apache/taverna/mobile/utils/ActivityUtils.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/utils/ActivityUtils.java b/app/src/main/java/org/apache/taverna/mobile/utils/ActivityUtils.java
index 6cbf7b9..c7907e8 100644
--- a/app/src/main/java/org/apache/taverna/mobile/utils/ActivityUtils.java
+++ b/app/src/main/java/org/apache/taverna/mobile/utils/ActivityUtils.java
@@ -25,10 +25,10 @@ import android.support.v4.app.FragmentTransaction;
public class ActivityUtils {
- public static void addFragmentToActivity (FragmentManager fragmentManager,
- Fragment fragment, int frameId) {
+ public static void addFragmentToActivity(FragmentManager fragmentManager, Fragment fragment,
+ int frameId) {
- for(int i = 0; i < fragmentManager.getBackStackEntryCount(); ++i) {
+ for (int i = 0; i < fragmentManager.getBackStackEntryCount(); ++i) {
fragmentManager.popBackStack();
}
FragmentTransaction transaction = fragmentManager.beginTransaction();
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/c8da89a8/app/src/main/java/org/apache/taverna/mobile/utils/Constants.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/utils/Constants.java b/app/src/main/java/org/apache/taverna/mobile/utils/Constants.java
index bcbff27..17499c2 100644
--- a/app/src/main/java/org/apache/taverna/mobile/utils/Constants.java
+++ b/app/src/main/java/org/apache/taverna/mobile/utils/Constants.java
@@ -24,4 +24,6 @@ public class Constants {
public static final String ARGS_MESSAGE = "args_message";
public static final String ARGS_URL = "url";
+
+ public static final String WORKFLOW_URL = "Workflow_url";
}
[41/50] [abbrv] incubator-taverna-mobile git commit: add player
logged in flag method
Posted by ia...@apache.org.
add player logged in flag method
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/9af7041c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/9af7041c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/9af7041c
Branch: refs/heads/master
Commit: 9af7041cad375a926423ab622da894fd311e1e41
Parents: 2d8a1ee
Author: Sagar <ku...@gmail.com>
Authored: Tue Sep 27 15:10:30 2016 +0530
Committer: Sagar <ku...@gmail.com>
Committed: Tue Sep 27 15:10:30 2016 +0530
----------------------------------------------------------------------
.../taverna/mobile/data/local/PreferencesHelper.java | 10 ++++++++--
.../apache/taverna/mobile/data/remote/BaseApiManager.java | 5 ++---
.../mobile/ui/playerlogin/PlayerLoginPresenter.java | 2 +-
3 files changed, 11 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/9af7041c/app/src/main/java/org/apache/taverna/mobile/data/local/PreferencesHelper.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/data/local/PreferencesHelper.java b/app/src/main/java/org/apache/taverna/mobile/data/local/PreferencesHelper.java
index 28099c9..04241c6 100644
--- a/app/src/main/java/org/apache/taverna/mobile/data/local/PreferencesHelper.java
+++ b/app/src/main/java/org/apache/taverna/mobile/data/local/PreferencesHelper.java
@@ -54,7 +54,7 @@ public class PreferencesHelper {
private static final String PREF_KEY_PLAYER_CREDENTIAL = "pref_player_credential";
- private static final String PREF_KEY_PLAYER_URL = "pref_player_url";
+ public static final String PREF_KEY_PLAYER_URL = "pref_player_url";
private final SharedPreferences mPref;
@@ -182,13 +182,19 @@ public class PreferencesHelper {
return mPref.getBoolean(PREF_KEY_PLAYER_LOGGED_IN, false);
}
- public void setUserPlayerLoggedInFlag(Boolean flag, String credential) {
+ public void setUserPlayerLoggedInFlagAndCredential(Boolean flag, String credential) {
mPref.edit().putBoolean(PREF_KEY_PLAYER_LOGGED_IN, flag).apply();
mPref.edit().putString(PREF_KEY_PLAYER_CREDENTIAL, credential).apply();
}
+ public void setUserPlayerLoggedInFlag(Boolean flag) {
+
+ mPref.edit().putBoolean(PREF_KEY_PLAYER_LOGGED_IN, flag).apply();
+
+ }
+
public String getUserPlayerCredential() {
return mPref.getString(PREF_KEY_PLAYER_CREDENTIAL, " ");
}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/9af7041c/app/src/main/java/org/apache/taverna/mobile/data/remote/BaseApiManager.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/data/remote/BaseApiManager.java b/app/src/main/java/org/apache/taverna/mobile/data/remote/BaseApiManager.java
index c17fc72..d276566 100644
--- a/app/src/main/java/org/apache/taverna/mobile/data/remote/BaseApiManager.java
+++ b/app/src/main/java/org/apache/taverna/mobile/data/remote/BaseApiManager.java
@@ -32,8 +32,6 @@ public class BaseApiManager {
public static final String MY_EXPERIMENT_END_POINT = "http://www.myexperiment.org/";
- public static final String TAVERNA_PLAYER_END_POINT = new PreferencesHelper
- (TavernaApplication.getContext()).getPlayerURL();
/********
* Helper class that sets up a new services with simplexml converter factory
@@ -72,6 +70,7 @@ public class BaseApiManager {
}
public TavernaPlayerService getTavernaPlayerApi() {
- return createJsonApi(TavernaPlayerService.class, TAVERNA_PLAYER_END_POINT);
+ return createJsonApi(TavernaPlayerService.class, new PreferencesHelper
+ (TavernaApplication.getContext()).getPlayerURL());
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/9af7041c/app/src/main/java/org/apache/taverna/mobile/ui/playerlogin/PlayerLoginPresenter.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/playerlogin/PlayerLoginPresenter.java b/app/src/main/java/org/apache/taverna/mobile/ui/playerlogin/PlayerLoginPresenter.java
index b75e9f8..170432d 100644
--- a/app/src/main/java/org/apache/taverna/mobile/ui/playerlogin/PlayerLoginPresenter.java
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/playerlogin/PlayerLoginPresenter.java
@@ -76,7 +76,7 @@ public class PlayerLoginPresenter extends BasePresenter<PlayerLoginMvpView> {
getMvpView().showCredentialError();
} else if (((HttpException) e).code() == 406) {
getMvpView().validCredential();
- mDataManager.getPreferencesHelper().setUserPlayerLoggedInFlag
+ mDataManager.getPreferencesHelper().setUserPlayerLoggedInFlagAndCredential
(loginFlag, getEncodedCredential(username, password));
} else {
[22/50] [abbrv] incubator-taverna-mobile git commit: add FAB click
Posted by ia...@apache.org.
add FAB click
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/f887f45d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/f887f45d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/f887f45d
Branch: refs/heads/master
Commit: f887f45d7df970c488b08a4569e3a3015bc32493
Parents: 1c6bb69
Author: Sagar <ku...@gmail.com>
Authored: Sun Sep 25 21:55:45 2016 +0530
Committer: Sagar <ku...@gmail.com>
Committed: Sun Sep 25 21:55:45 2016 +0530
----------------------------------------------------------------------
.../mobile/ui/workflowdetail/WorkflowDetailFragment.java | 7 +++++++
app/src/main/res/layout/fragment_detail_workflow.xml | 2 +-
2 files changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/f887f45d/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailFragment.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailFragment.java b/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailFragment.java
index be83a11..db88f92 100644
--- a/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailFragment.java
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailFragment.java
@@ -50,6 +50,7 @@ import org.apache.taverna.mobile.data.model.User;
import org.apache.taverna.mobile.data.model.Workflow;
import org.apache.taverna.mobile.ui.imagezoom.ImageZoomActivity;
import org.apache.taverna.mobile.ui.imagezoom.ImageZoomFragment;
+import org.apache.taverna.mobile.ui.workflowrun.WorkflowRunActivity;
import org.apache.taverna.mobile.utils.ConnectionInfo;
import butterknife.BindView;
@@ -166,6 +167,12 @@ public class WorkflowDetailFragment extends Fragment implements WorkflowDetailMv
}
+ @OnClick(R.id.fabRun)
+ void fabRunClick(View v){
+ Intent intent = new Intent(getActivity(), WorkflowRunActivity.class);
+ startActivity(intent);
+ }
+
@OnClick(R.id.ivWorkflowImage)
void zoomImage(View v) {
Intent intent = new Intent(getActivity(), ImageZoomActivity.class);
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/f887f45d/app/src/main/res/layout/fragment_detail_workflow.xml
----------------------------------------------------------------------
diff --git a/app/src/main/res/layout/fragment_detail_workflow.xml b/app/src/main/res/layout/fragment_detail_workflow.xml
index f5d2847..0b5ff65 100644
--- a/app/src/main/res/layout/fragment_detail_workflow.xml
+++ b/app/src/main/res/layout/fragment_detail_workflow.xml
@@ -149,7 +149,7 @@
</RelativeLayout>
<android.support.design.widget.FloatingActionButton
- android:id="@+id/action_button_location"
+ android:id="@+id/fabRun"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom|end"
[15/50] [abbrv] incubator-taverna-mobile git commit: add stepview
library
Posted by ia...@apache.org.
add stepview library
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/2e4c7bb0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/2e4c7bb0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/2e4c7bb0
Branch: refs/heads/master
Commit: 2e4c7bb03a8bd449fd1b31562fa9aa8a32988fa3
Parents: 81b1a7a
Author: Sagar <ku...@gmail.com>
Authored: Sun Sep 25 18:30:39 2016 +0530
Committer: Sagar <ku...@gmail.com>
Committed: Sun Sep 25 18:30:39 2016 +0530
----------------------------------------------------------------------
app/build.gradle | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/2e4c7bb0/app/build.gradle
----------------------------------------------------------------------
diff --git a/app/build.gradle b/app/build.gradle
index f75ca9c..2282111 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -79,4 +79,6 @@ dependencies {
compile 'com.google.code.gson:gson:2.7'
compile 'com.squareup.retrofit2:converter-gson:2.0.2'
+ compile 'com.anton46:stepsview:0.0.2'
+
}
[50/50] [abbrv] incubator-taverna-mobile git commit: move player
default url to constant string
Posted by ia...@apache.org.
move player default url to constant string
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/afae2b90
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/afae2b90
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/afae2b90
Branch: refs/heads/master
Commit: afae2b90f6d404c3aa09ee0d1c94b279967194b0
Parents: c8da89a
Author: Sagar <ku...@gmail.com>
Authored: Thu Sep 29 23:38:40 2016 +0530
Committer: Sagar <ku...@gmail.com>
Committed: Thu Sep 29 23:38:40 2016 +0530
----------------------------------------------------------------------
.../org/apache/taverna/mobile/data/local/PreferencesHelper.java | 4 +++-
.../main/java/org/apache/taverna/mobile/utils/ActivityUtils.java | 1 -
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/afae2b90/app/src/main/java/org/apache/taverna/mobile/data/local/PreferencesHelper.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/data/local/PreferencesHelper.java b/app/src/main/java/org/apache/taverna/mobile/data/local/PreferencesHelper.java
index 41d29e3..9b5c87e 100644
--- a/app/src/main/java/org/apache/taverna/mobile/data/local/PreferencesHelper.java
+++ b/app/src/main/java/org/apache/taverna/mobile/data/local/PreferencesHelper.java
@@ -56,6 +56,8 @@ public class PreferencesHelper {
public static final String PREF_KEY_PLAYER_URL = "pref_player_url";
+ public static final String PLAYER_DEFAULT_URL = "http://139.59.28.12:3000/";
+
private final SharedPreferences mPref;
private final SharedPreferences sharedPref;
@@ -197,6 +199,6 @@ public class PreferencesHelper {
}
public String getPlayerURL() {
- return sharedPref.getString(PREF_KEY_PLAYER_URL, "http://139.59.28.12:3000/");
+ return sharedPref.getString(PREF_KEY_PLAYER_URL, PLAYER_DEFAULT_URL);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/afae2b90/app/src/main/java/org/apache/taverna/mobile/utils/ActivityUtils.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/utils/ActivityUtils.java b/app/src/main/java/org/apache/taverna/mobile/utils/ActivityUtils.java
index c7907e8..3d0c0dd 100644
--- a/app/src/main/java/org/apache/taverna/mobile/utils/ActivityUtils.java
+++ b/app/src/main/java/org/apache/taverna/mobile/utils/ActivityUtils.java
@@ -34,7 +34,6 @@ public class ActivityUtils {
FragmentTransaction transaction = fragmentManager.beginTransaction();
transaction.replace(frameId, fragment);
transaction.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_CLOSE);
- transaction.addToBackStack(null);
transaction.commit();
}
[35/50] [abbrv] incubator-taverna-mobile git commit: Merge branch
'master' into PlayerIntegration
Posted by ia...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/2bef77c5/projectFilesBackup/.idea/workspace.xml
----------------------------------------------------------------------
diff --cc projectFilesBackup/.idea/workspace.xml
index 0000000,0000000..3e95395
new file mode 100644
--- /dev/null
+++ b/projectFilesBackup/.idea/workspace.xml
@@@ -1,0 -1,0 +1,3587 @@@
++<?xml version="1.0" encoding="UTF-8"?>
++<project version="4">
++ <component name="AndroidLayouts">
++ <shared>
++ <config>
++ <devices>
++ <device id="Nexus 5X" />
++ <device id="Nexus One" />
++ </devices>
++ </config>
++ </shared>
++ <layouts>
++ <layout url="file://$PROJECT_DIR$/app/src/main/res/layout/dialog_player_login_layout.xml">
++ <config>
++ <theme>@style/Theme.Taverna</theme>
++ </config>
++ </layout>
++ <layout url="file://$PROJECT_DIR$/app/src/main/res/layout/fragment_login.xml">
++ <config>
++ <theme>@style/Theme.Taverna</theme>
++ </config>
++ </layout>
++ <layout url="file://$PROJECT_DIR$/app/src/main/res/menu/dashboard_main.xml">
++ <config>
++ <theme>@android:style/Theme.Material.Light</theme>
++ </config>
++ </layout>
++ <layout url="file://$PROJECT_DIR$/app/src/main/res/menu/drawer_view.xml">
++ <config>
++ <theme>@android:style/Theme.Material.Light</theme>
++ </config>
++ </layout>
++ <layout url="file://$PROJECT_DIR$/app/src/main/res/menu/global.xml">
++ <config>
++ <theme>@android:style/Theme.Material.Light</theme>
++ </config>
++ </layout>
++ <layout url="file://$PROJECT_DIR$/app/src/main/res/menu/menu_workflow_detail.xml">
++ <config>
++ <theme>@android:style/Theme.Material.Light</theme>
++ </config>
++ </layout>
++ </layouts>
++ </component>
++ <component name="AndroidLogFilters">
++ <option name="TOOL_WINDOW_CONFIGURED_FILTER" value="Show only selected application" />
++ </component>
++ <component name="ChangeListManager">
++ <list default="true" id="4e8e1bfd-85ff-4e0c-aafa-440e63460b9a" name="Default" comment="add">
++ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/src/main/java/org/apache/taverna/mobile/ui/playerlogin/PlayerLoginDialog.java" />
++ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/src/main/java/org/apache/taverna/mobile/ui/playerlogin/PlayerLoginMvpView.java" />
++ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/src/main/java/org/apache/taverna/mobile/ui/playerlogin/PlayerLoginPresenter.java" />
++ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/src/main/res/layout/dialog_player_login_layout.xml" />
++ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/java/org/apache/taverna/mobile/data/DataManager.java" afterPath="$PROJECT_DIR$/app/src/main/java/org/apache/taverna/mobile/data/DataManager.java" />
++ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/java/org/apache/taverna/mobile/data/remote/TavernaPlayerService.java" afterPath="$PROJECT_DIR$/app/src/main/java/org/apache/taverna/mobile/data/remote/TavernaPlayerService.java" />
++ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailFragment.java" afterPath="$PROJECT_DIR$/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailFragment.java" />
++ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailPresenter.java" afterPath="$PROJECT_DIR$/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailPresenter.java" />
++ </list>
++ <ignored path="incubator-taverna-mobile.iws" />
++ <ignored path=".idea/workspace.xml" />
++ <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
++ <option name="TRACKING_ENABLED" value="true" />
++ <option name="SHOW_DIALOG" value="false" />
++ <option name="HIGHLIGHT_CONFLICTS" value="true" />
++ <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
++ <option name="LAST_RESOLUTION" value="IGNORE" />
++ </component>
++ <component name="ChangesViewManager" flattened_view="true" show_ignored="false" />
++ <component name="CreatePatchCommitExecutor">
++ <option name="PATCH_PATH" value="" />
++ </component>
++ <component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
++ <component name="ExternalProjectsManager">
++ <system id="GRADLE">
++ <state>
++ <task path="$PROJECT_DIR$/app">
++ <activation />
++ </task>
++ <task path="$PROJECT_DIR$">
++ <activation />
++ </task>
++ <projects_view>
++ <tree_state>
++ <PATH>
++ <PATH_ELEMENT>
++ <option name="myItemId" value="" />
++ <option name="myItemType" value="com.intellij.openapi.externalSystem.view.ExternalProjectsStructure$RootNode" />
++ </PATH_ELEMENT>
++ <PATH_ELEMENT>
++ <option name="myItemId" value="incubator-taverna-mobile" />
++ <option name="myItemType" value="com.intellij.openapi.externalSystem.view.ProjectNode" />
++ </PATH_ELEMENT>
++ </PATH>
++ <PATH>
++ <PATH_ELEMENT>
++ <option name="myItemId" value="" />
++ <option name="myItemType" value="com.intellij.openapi.externalSystem.view.ExternalProjectsStructure$RootNode" />
++ </PATH_ELEMENT>
++ <PATH_ELEMENT>
++ <option name="myItemId" value="incubator-taverna-mobile" />
++ <option name="myItemType" value="com.intellij.openapi.externalSystem.view.ProjectNode" />
++ </PATH_ELEMENT>
++ <PATH_ELEMENT>
++ <option name="myItemId" value="incubator-taverna-mobile" />
++ <option name="myItemType" value="com.intellij.openapi.externalSystem.view.ModuleNode" />
++ </PATH_ELEMENT>
++ </PATH>
++ <PATH>
++ <PATH_ELEMENT>
++ <option name="myItemId" value="" />
++ <option name="myItemType" value="com.intellij.openapi.externalSystem.view.ExternalProjectsStructure$RootNode" />
++ </PATH_ELEMENT>
++ <PATH_ELEMENT>
++ <option name="myItemId" value="incubator-taverna-mobile" />
++ <option name="myItemType" value="com.intellij.openapi.externalSystem.view.ProjectNode" />
++ </PATH_ELEMENT>
++ <PATH_ELEMENT>
++ <option name="myItemId" value="incubator-taverna-mobile" />
++ <option name="myItemType" value="com.intellij.openapi.externalSystem.view.ModuleNode" />
++ </PATH_ELEMENT>
++ <PATH_ELEMENT>
++ <option name="myItemId" value="Tasks" />
++ <option name="myItemType" value="com.intellij.openapi.externalSystem.view.TasksNode" />
++ </PATH_ELEMENT>
++ </PATH>
++ <PATH>
++ <PATH_ELEMENT>
++ <option name="myItemId" value="" />
++ <option name="myItemType" value="com.intellij.openapi.externalSystem.view.ExternalProjectsStructure$RootNode" />
++ </PATH_ELEMENT>
++ <PATH_ELEMENT>
++ <option name="myItemId" value="incubator-taverna-mobile" />
++ <option name="myItemType" value="com.intellij.openapi.externalSystem.view.ProjectNode" />
++ </PATH_ELEMENT>
++ <PATH_ELEMENT>
++ <option name="myItemId" value="incubator-taverna-mobile" />
++ <option name="myItemType" value="com.intellij.openapi.externalSystem.view.ModuleNode" />
++ </PATH_ELEMENT>
++ <PATH_ELEMENT>
++ <option name="myItemId" value="Tasks" />
++ <option name="myItemType" value="com.intellij.openapi.externalSystem.view.TasksNode" />
++ </PATH_ELEMENT>
++ <PATH_ELEMENT>
++ <option name="myItemId" value="help" />
++ <option name="myItemType" value="com.intellij.openapi.externalSystem.view.TasksNode$1" />
++ </PATH_ELEMENT>
++ </PATH>
++ <PATH>
++ <PATH_ELEMENT>
++ <option name="myItemId" value="" />
++ <option name="myItemType" value="com.intellij.openapi.externalSystem.view.ExternalProjectsStructure$RootNode" />
++ </PATH_ELEMENT>
++ <PATH_ELEMENT>
++ <option name="myItemId" value="incubator-taverna-mobile" />
++ <option name="myItemType" value="com.intellij.openapi.externalSystem.view.ProjectNode" />
++ </PATH_ELEMENT>
++ <PATH_ELEMENT>
++ <option name="myItemId" value="incubator-taverna-mobile" />
++ <option name="myItemType" value="com.intellij.openapi.externalSystem.view.ModuleNode" />
++ </PATH_ELEMENT>
++ <PATH_ELEMENT>
++ <option name="myItemId" value="Tasks" />
++ <option name="myItemType" value="com.intellij.openapi.externalSystem.view.TasksNode" />
++ </PATH_ELEMENT>
++ <PATH_ELEMENT>
++ <option name="myItemId" value="build setup" />
++ <option name="myItemType" value="com.intellij.openapi.externalSystem.view.TasksNode$1" />
++ </PATH_ELEMENT>
++ </PATH>
++ <PATH>
++ <PATH_ELEMENT>
++ <option name="myItemId" value="" />
++ <option name="myItemType" value="com.intellij.openapi.externalSystem.view.ExternalProjectsStructure$RootNode" />
++ </PATH_ELEMENT>
++ <PATH_ELEMENT>
++ <option name="myItemId" value="incubator-taverna-mobile" />
++ <option name="myItemType" value="com.intellij.openapi.externalSystem.view.ProjectNode" />
++ </PATH_ELEMENT>
++ <PATH_ELEMENT>
++ <option name="myItemId" value="incubator-taverna-mobile" />
++ <option name="myItemType" value="com.intellij.openapi.externalSystem.view.ModuleNode" />
++ </PATH_ELEMENT>
++ <PATH_ELEMENT>
++ <option name="myItemId" value="Tasks" />
++ <option name="myItemType" value="com.intellij.openapi.externalSystem.view.TasksNode" />
++ </PATH_ELEMENT>
++ <PATH_ELEMENT>
++ <option name="myItemId" value="build" />
++ <option name="myItemType" value="com.intellij.openapi.externalSystem.view.TasksNode$1" />
++ </PATH_ELEMENT>
++ </PATH>
++ <PATH>
++ <PATH_ELEMENT>
++ <option name="myItemId" value="" />
++ <option name="myItemType" value="com.intellij.openapi.externalSystem.view.ExternalProjectsStructure$RootNode" />
++ </PATH_ELEMENT>
++ <PATH_ELEMENT>
++ <option name="myItemId" value="incubator-taverna-mobile" />
++ <option name="myItemType" value="com.intellij.openapi.externalSystem.view.ProjectNode" />
++ </PATH_ELEMENT>
++ <PATH_ELEMENT>
++ <option name="myItemId" value="incubator-taverna-mobile" />
++ <option name="myItemType" value="com.intellij.openapi.externalSystem.view.ModuleNode" />
++ </PATH_ELEMENT>
++ <PATH_ELEMENT>
++ <option name="myItemId" value="Tasks" />
++ <option name="myItemType" value="com.intellij.openapi.externalSystem.view.TasksNode" />
++ </PATH_ELEMENT>
++ <PATH_ELEMENT>
++ <option name="myItemId" value="android" />
++ <option name="myItemType" value="com.intellij.openapi.externalSystem.view.TasksNode$1" />
++ </PATH_ELEMENT>
++ </PATH>
++ </tree_state>
++ </projects_view>
++ </state>
++ </system>
++ </component>
++ <component name="FavoritesManager">
++ <favorites_list name="incubator-taverna-mobile" />
++ </component>
++ <component name="FileEditorManager">
++ <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
++ <file leaf-file-name="WorkflowDetailPresenter.java" pinned="false" current-in-tab="false">
++ <entry file="file://$PROJECT_DIR$/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailPresenter.java">
++ <provider selected="true" editor-type-id="text-editor">
++ <state vertical-scroll-proportion="0.0">
++ <caret line="275" column="51" selection-start-line="275" selection-start-column="51" selection-end-line="275" selection-end-column="51" />
++ <folding />
++ </state>
++ </provider>
++ </entry>
++ </file>
++ <file leaf-file-name="AnnouncementFragment.java" pinned="false" current-in-tab="true">
++ <entry file="file://$PROJECT_DIR$/app/src/main/java/org/apache/taverna/mobile/ui/anouncements/AnnouncementFragment.java">
++ <provider selected="true" editor-type-id="text-editor">
++ <state vertical-scroll-proportion="1.0944881">
++ <caret line="121" column="8" selection-start-line="121" selection-start-column="8" selection-end-line="121" selection-end-column="8" />
++ <folding />
++ </state>
++ </provider>
++ </entry>
++ </file>
++ </leaf>
++ </component>
++ <component name="FileTemplateManagerImpl">
++ <option name="RECENT_TEMPLATES">
++ <list>
++ <option value="layoutResourceFile_vertical" />
++ <option value="Class" />
++ </list>
++ </option>
++ </component>
++ <component name="Git.Settings">
++ <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
++ <option name="RECENT_BRANCH_BY_REPOSITORY">
++ <map>
++ <entry key="$PROJECT_DIR$" value="testing" />
++ </map>
++ </option>
++ <option name="RESET_MODE" value="SOFT" />
++ </component>
++ <component name="GradleLocalSettings">
++ <option name="availableProjects">
++ <map>
++ <entry>
++ <key>
++ <ExternalProjectPojo>
++ <option name="name" value="incubator-taverna-mobile" />
++ <option name="path" value="$PROJECT_DIR$" />
++ </ExternalProjectPojo>
++ </key>
++ <value>
++ <list>
++ <ExternalProjectPojo>
++ <option name="name" value=":app" />
++ <option name="path" value="$PROJECT_DIR$/app" />
++ </ExternalProjectPojo>
++ <ExternalProjectPojo>
++ <option name="name" value="incubator-taverna-mobile" />
++ <option name="path" value="$PROJECT_DIR$" />
++ </ExternalProjectPojo>
++ </list>
++ </value>
++ </entry>
++ </map>
++ </option>
++ <option name="availableTasks">
++ <map>
++ <entry key="$PROJECT_DIR$">
++ <value>
++ <list>
++ <ExternalTaskPojo>
++ <option name="description" value="Displays all buildscript dependencies declared in root project 'incubator-taverna-mobile'." />
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="buildEnvironment" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="description" value="Displays the components produced by root project 'incubator-taverna-mobile'. [incubating]" />
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="components" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="description" value="Displays all dependencies declared in root project 'incubator-taverna-mobile'." />
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="dependencies" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="description" value="Displays the insight into a specific dependency in root project 'incubator-taverna-mobile'." />
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="dependencyInsight" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="description" value="Displays a help message." />
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="help" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="description" value="Initializes a new Gradle build. [incubating]" />
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="init" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="description" value="Displays the configuration model of root project 'incubator-taverna-mobile'. [incubating]" />
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="model" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="description" value="Displays the sub-projects of root project 'incubator-taverna-mobile'." />
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="projects" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="description" value="Displays the properties of root project 'incubator-taverna-mobile'." />
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="properties" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="description" value="Displays the tasks runnable from root project 'incubator-taverna-mobile' (some of the displayed tasks may belong to subprojects)." />
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="tasks" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="description" value="Generates Gradle wrapper files. [incubating]" />
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="wrapper" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="description" value="Displays the Android dependencies of the project." />
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="androidDependencies" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="description" value="Assembles all variants of all applications and secondary packages." />
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="assemble" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="description" value="Assembles all the Test applications." />
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="assembleAndroidTest" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="description" value="Assembles all Debug builds." />
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="assembleDebug" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="assembleDebugAndroidTest" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="assembleDebugUnitTest" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="description" value="Assembles all Release builds." />
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="assembleRelease" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="assembleReleaseUnitTest" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="description" value="Assembles and tests this project." />
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="build" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="description" value="Assembles and tests this project and all projects that depend on it." />
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="buildDependents" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="description" value="Assembles and tests this project and all projects it depends on." />
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="buildNeeded" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="description" value="Runs all checks." />
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="check" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="checkDebugManifest" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="checkReleaseManifest" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="description" value="Runs code style checks" />
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="checkstyle" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="description" value="Deletes the build directory." />
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="clean" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="collectDebugAndroidTestMultiDexComponents" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="collectDebugMultiDexComponents" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="collectReleaseMultiDexComponents" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="compileDebugAidl" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="compileDebugAndroidTestAidl" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="compileDebugAndroidTestJavaWithJavac" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="compileDebugAndroidTestNdk" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="compileDebugAndroidTestRenderscript" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="compileDebugAndroidTestShaders" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="compileDebugAndroidTestSources" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="compileDebugJavaWithJavac" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="compileDebugNdk" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="compileDebugRenderscript" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="compileDebugShaders" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="compileDebugSources" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="compileDebugUnitTestJavaWithJavac" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="compileDebugUnitTestSources" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="compileLint" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="compileReleaseAidl" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="compileReleaseJavaWithJavac" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="compileReleaseNdk" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="compileReleaseRenderscript" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="compileReleaseShaders" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="compileReleaseSources" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="compileReleaseUnitTestJavaWithJavac" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="compileReleaseUnitTestSources" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="description" value="Installs and runs instrumentation tests for all flavors on connected devices." />
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="connectedAndroidTest" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="description" value="Runs all device checks on currently connected devices." />
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="connectedCheck" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="description" value="Installs and runs the tests for debug on connected devices." />
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="connectedDebugAndroidTest" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="description" value="Installs and runs instrumentation tests using all Device Providers." />
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="deviceAndroidTest" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="description" value="Runs all device checks using Device Providers and Test Servers." />
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="deviceCheck" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="description" value="Inspect java bytecode for bugs" />
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="findbugs" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="generateDebugAndroidTestAssets" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="generateDebugAndroidTestBuildConfig" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="generateDebugAndroidTestResValues" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="generateDebugAndroidTestResources" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="generateDebugAndroidTestSources" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="generateDebugAssets" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="generateDebugBuildConfig" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="generateDebugResValues" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="generateDebugResources" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="generateDebugSources" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="generateReleaseAssets" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="generateReleaseBuildConfig" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="generateReleaseResValues" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="generateReleaseResources" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="generateReleaseSources" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="incrementalDebugAndroidTestJavaCompilationSafeguard" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="incrementalDebugJavaCompilationSafeguard" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="incrementalDebugUnitTestJavaCompilationSafeguard" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="incrementalReleaseJavaCompilationSafeguard" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="incrementalReleaseUnitTestJavaCompilationSafeguard" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="description" value="Installs the Debug build." />
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="installDebug" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="description" value="Installs the android (on device) tests for the Debug build." />
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="installDebugAndroidTest" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="jarDebugClasses" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="jarReleaseClasses" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="description" value="Runs lint on all variants." />
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="lint" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="description" value="Runs lint on the Debug build." />
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="lintDebug" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="description" value="Runs lint on the Release build." />
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="lintRelease" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="description" value="Runs lint on just the fatal issues in the Release build." />
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="lintVitalRelease" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="mergeDebugAndroidTestAssets" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="mergeDebugAndroidTestJniLibFolders" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="mergeDebugAndroidTestResources" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="mergeDebugAndroidTestShaders" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="mergeDebugAssets" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="mergeDebugJniLibFolders" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="mergeDebugResources" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="mergeDebugShaders" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="mergeReleaseAssets" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="mergeReleaseJniLibFolders" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="mergeReleaseResources" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="mergeReleaseShaders" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="description" value="Creates a version of android.jar that's suitable for unit tests." />
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="mockableAndroidJar" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="packageDebug" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="packageDebugAndroidTest" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="packageRelease" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="description" value="Inspect sourcecode for bugs" />
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="pmd" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="preBuild" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="preDebugAndroidTestBuild" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="preDebugBuild" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="preDebugUnitTestBuild" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="prePackageMarkerForDebug" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="prePackageMarkerForDebugAndroidTest" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="prePackageMarkerForRelease" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="preReleaseBuild" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="preReleaseUnitTestBuild" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="description" value="Prepare com.android.support:animated-vector-drawable:23.3.0" />
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="prepareComAndroidSupportAnimatedVectorDrawable2330Library" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="description" value="Prepare com.android.support:appcompat-v7:23.3.0" />
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="prepareComAndroidSupportAppcompatV72330Library" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="description" value="Prepare com.android.support:cardview-v7:23.3.0" />
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="prepareComAndroidSupportCardviewV72330Library" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="description" value="Prepare com.android.support:design:23.3.0" />
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="prepareComAndroidSupportDesign2330Library" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="description" value="Prepare com.android.support:multidex:1.0.1" />
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="prepareComAndroidSupportMultidex101Library" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="description" value="Prepare com.android.support:multidex-instrumentation:1.0.1" />
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="prepareComAndroidSupportMultidexInstrumentation101Library" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="description" value="Prepare com.android.support:recyclerview-v7:23.3.0" />
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="prepareComAndroidSupportRecyclerviewV72330Library" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="description" value="Prepare com.android.support:support-v4:23.3.0" />
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="prepareComAndroidSupportSupportV42330Library" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="description" value="Prepare com.android.support:support-vector-drawable:23.3.0" />
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="prepareComAndroidSupportSupportVectorDrawable2330Library" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="description" value="Prepare com.github.chrisbanes:PhotoView:1.2.6" />
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="prepareComGithubChrisbanesPhotoView126Library" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="description" value="Prepare com.github.Raizlabs.DBFlow:dbflow:3.0.1" />
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="prepareComGithubRaizlabsDBFlowDbflow301Library" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="description" value="Prepare com.jakewharton:butterknife:8.0.1" />
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="prepareComJakewhartonButterknife801Library" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="prepareDebugAndroidTestDependencies" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="prepareDebugDependencies" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="prepareDebugUnitTestDependencies" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="description" value="Prepare io.reactivex:rxandroid:1.2.0" />
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="prepareIoReactivexRxandroid120Library" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="prepareReleaseDependencies" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="prepareReleaseUnitTestDependencies" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="processDebugAndroidTestJavaRes" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="processDebugAndroidTestManifest" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="processDebugAndroidTestResources" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="processDebugJavaRes" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="processDebugManifest" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="processDebugResources" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="processDebugUnitTestJavaRes" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="processReleaseJavaRes" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="processReleaseManifest" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="processReleaseResources" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="processReleaseUnitTestJavaRes" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="description" value="Displays the signing info for each variant." />
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="signingReport" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="description" value="Prints out all the source sets defined in this project." />
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="sourceSets" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="description" value="Run unit tests for all variants." />
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="test" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="description" value="Run unit tests for the debug build." />
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="testDebugUnitTest" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="description" value="Run unit tests for the release build." />
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="testReleaseUnitTest" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="transformClassesWithDexForDebug" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="transformClassesWithDexForDebugAndroidTest" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="transformClassesWithDexForRelease" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="transformClassesWithJarMergingForDebug" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="transformClassesWithJarMergingForDebugAndroidTest" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="transformClassesWithJarMergingForRelease" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="transformClassesWithMultidexlistForDebug" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="transformClassesWithMultidexlistForDebugAndroidTest" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="transformClassesWithMultidexlistForRelease" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="transformNative_libsWithMergeJniLibsForDebug" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="transformNative_libsWithMergeJniLibsForDebugAndroidTest" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="transformNative_libsWithMergeJniLibsForRelease" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="transformResourcesWithMergeJavaResForDebug" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="transformResourcesWithMergeJavaResForDebugAndroidTest" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="transformResourcesWithMergeJavaResForDebugUnitTest" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="transformResourcesWithMergeJavaResForRelease" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="transformResourcesWithMergeJavaResForReleaseUnitTest" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="description" value="Uninstall all applications." />
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="uninstallAll" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="description" value="Uninstalls the Debug build." />
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="uninstallDebug" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="description" value="Uninstalls the android (on device) tests for the Debug build." />
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="uninstallDebugAndroidTest" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="description" value="Uninstalls the Release build." />
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="uninstallRelease" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="validateDebugSigning" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
++ <option name="name" value="zipalignDebug" />
++ </ExternalTaskPojo>
++ </list>
++ </value>
++ </entry>
++ <entry key="$PROJECT_DIR$/app">
++ <value>
++ <list>
++ <ExternalTaskPojo>
++ <option name="description" value="Displays the Android dependencies of the project." />
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
++ <option name="name" value="androidDependencies" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="description" value="Assembles all variants of all applications and secondary packages." />
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
++ <option name="name" value="assemble" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="description" value="Assembles all the Test applications." />
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
++ <option name="name" value="assembleAndroidTest" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="description" value="Assembles all Debug builds." />
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
++ <option name="name" value="assembleDebug" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
++ <option name="name" value="assembleDebugAndroidTest" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
++ <option name="name" value="assembleDebugUnitTest" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="description" value="Assembles all Release builds." />
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
++ <option name="name" value="assembleRelease" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
++ <option name="name" value="assembleReleaseUnitTest" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="description" value="Assembles and tests this project." />
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
++ <option name="name" value="build" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="description" value="Assembles and tests this project and all projects that depend on it." />
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
++ <option name="name" value="buildDependents" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="description" value="Displays all buildscript dependencies declared in project ':app'." />
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
++ <option name="name" value="buildEnvironment" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="description" value="Assembles and tests this project and all projects it depends on." />
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
++ <option name="name" value="buildNeeded" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="description" value="Runs all checks." />
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
++ <option name="name" value="check" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
++ <option name="name" value="checkDebugManifest" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
++ <option name="name" value="checkReleaseManifest" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="description" value="Runs code style checks" />
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
++ <option name="name" value="checkstyle" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="description" value="Deletes the build directory." />
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
++ <option name="name" value="clean" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
++ <option name="name" value="collectDebugAndroidTestMultiDexComponents" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
++ <option name="name" value="collectDebugMultiDexComponents" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
++ <option name="name" value="collectReleaseMultiDexComponents" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
++ <option name="name" value="compileDebugAidl" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
++ <option name="name" value="compileDebugAndroidTestAidl" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
++ <option name="name" value="compileDebugAndroidTestJavaWithJavac" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
++ <option name="name" value="compileDebugAndroidTestNdk" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
++ <option name="name" value="compileDebugAndroidTestRenderscript" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
++ <option name="name" value="compileDebugAndroidTestShaders" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
++ <option name="name" value="compileDebugAndroidTestSources" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
++ <option name="name" value="compileDebugJavaWithJavac" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
++ <option name="name" value="compileDebugNdk" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
++ <option name="name" value="compileDebugRenderscript" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
++ <option name="name" value="compileDebugShaders" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
++ <option name="name" value="compileDebugSources" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
++ <option name="name" value="compileDebugUnitTestJavaWithJavac" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
++ <option name="name" value="compileDebugUnitTestSources" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
++ <option name="name" value="compileLint" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
++ <option name="name" value="compileReleaseAidl" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
++ <option name="name" value="compileReleaseJavaWithJavac" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
++ <option name="name" value="compileReleaseNdk" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
++ <option name="name" value="compileReleaseRenderscript" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
++ <option name="name" value="compileReleaseShaders" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
++ <option name="name" value="compileReleaseSources" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
++ <option name="name" value="compileReleaseUnitTestJavaWithJavac" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
++ <option name="name" value="compileReleaseUnitTestSources" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="description" value="Displays the components produced by project ':app'. [incubating]" />
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
++ <option name="name" value="components" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="description" value="Installs and runs instrumentation tests for all flavors on connected devices." />
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
++ <option name="name" value="connectedAndroidTest" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="description" value="Runs all device checks on currently connected devices." />
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
++ <option name="name" value="connectedCheck" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="description" value="Installs and runs the tests for debug on connected devices." />
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
++ <option name="name" value="connectedDebugAndroidTest" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="description" value="Displays all dependencies declared in project ':app'." />
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
++ <option name="name" value="dependencies" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="description" value="Displays the insight into a specific dependency in project ':app'." />
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
++ <option name="name" value="dependencyInsight" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="description" value="Installs and runs instrumentation tests using all Device Providers." />
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
++ <option name="name" value="deviceAndroidTest" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="description" value="Runs all device checks using Device Providers and Test Servers." />
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
++ <option name="name" value="deviceCheck" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="description" value="Inspect java bytecode for bugs" />
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
++ <option name="name" value="findbugs" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
++ <option name="name" value="generateDebugAndroidTestAssets" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
++ <option name="name" value="generateDebugAndroidTestBuildConfig" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
++ <option name="name" value="generateDebugAndroidTestResValues" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
++ <option name="name" value="generateDebugAndroidTestResources" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
++ <option name="name" value="generateDebugAndroidTestSources" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
++ <option name="name" value="generateDebugAssets" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
++ <option name="name" value="generateDebugBuildConfig" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
++ <option name="name" value="generateDebugResValues" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
++ <option name="name" value="generateDebugResources" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
++ <option name="name" value="generateDebugSources" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
++ <option name="name" value="generateReleaseAssets" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
++ <option name="name" value="generateReleaseBuildConfig" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
++ <option name="name" value="generateReleaseResValues" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
++ <option name="name" value="generateReleaseResources" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
++ <option name="name" value="generateReleaseSources" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="description" value="Displays a help message." />
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
++ <option name="name" value="help" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
++ <option name="name" value="incrementalDebugAndroidTestJavaCompilationSafeguard" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
++ <option name="name" value="incrementalDebugJavaCompilationSafeguard" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
++ <option name="name" value="incrementalDebugUnitTestJavaCompilationSafeguard" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
++ <option name="name" value="incrementalReleaseJavaCompilationSafeguard" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
++ <option name="name" value="incrementalReleaseUnitTestJavaCompilationSafeguard" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="description" value="Installs the Debug build." />
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
++ <option name="name" value="installDebug" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="description" value="Installs the android (on device) tests for the Debug build." />
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
++ <option name="name" value="installDebugAndroidTest" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
++ <option name="name" value="jarDebugClasses" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
++ <option name="name" value="jarReleaseClasses" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="description" value="Runs lint on all variants." />
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
++ <option name="name" value="lint" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="description" value="Runs lint on the Debug build." />
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
++ <option name="name" value="lintDebug" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="description" value="Runs lint on the Release build." />
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
++ <option name="name" value="lintRelease" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="description" value="Runs lint on just the fatal issues in the Release build." />
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
++ <option name="name" value="lintVitalRelease" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
++ <option name="name" value="mergeDebugAndroidTestAssets" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
++ <option name="name" value="mergeDebugAndroidTestJniLibFolders" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
++ <option name="name" value="mergeDebugAndroidTestResources" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
++ <option name="name" value="mergeDebugAndroidTestShaders" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
++ <option name="name" value="mergeDebugAssets" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
++ <option name="name" value="mergeDebugJniLibFolders" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
++ <option name="name" value="mergeDebugResources" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
++ <option name="name" value="mergeDebugShaders" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
++ <option name="name" value="mergeReleaseAssets" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
++ <option name="name" value="mergeReleaseJniLibFolders" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
++ <option name="name" value="mergeReleaseResources" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
++ <option name="name" value="mergeReleaseShaders" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="description" value="Creates a version of android.jar that's suitable for unit tests." />
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
++ <option name="name" value="mockableAndroidJar" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="description" value="Displays the configuration model of project ':app'. [incubating]" />
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
++ <option name="name" value="model" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
++ <option name="name" value="packageDebug" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
++ <option name="name" value="packageDebugAndroidTest" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
++ <option name="name" value="packageRelease" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="description" value="Inspect sourcecode for bugs" />
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
++ <option name="name" value="pmd" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
++ <option name="name" value="preBuild" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
++ <option name="name" value="preDebugAndroidTestBuild" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
++ <option name="name" value="preDebugBuild" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
++ <option name="name" value="preDebugUnitTestBuild" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
++ <option name="name" value="prePackageMarkerForDebug" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
++ <option name="name" value="prePackageMarkerForDebugAndroidTest" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
++ <option name="name" value="prePackageMarkerForRelease" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
++ <option name="name" value="preReleaseBuild" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
++ <option name="name" value="preReleaseUnitTestBuild" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="description" value="Prepare com.android.support:animated-vector-drawable:23.3.0" />
++ <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
++ <option name="name" value="prepareComAndroidSupportAnimatedVectorDrawable2330Library" />
++ </ExternalTaskPojo>
++ <ExternalTaskPojo>
++ <option name="description" value="Prepare com.android.support:appcompat
<TRUNCATED>
[19/50] [abbrv] incubator-taverna-mobile git commit: add downloading
view fragment
Posted by ia...@apache.org.
add downloading view fragment
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/b4d37257
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/b4d37257
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/b4d37257
Branch: refs/heads/master
Commit: b4d37257f9674d63b60688fb37d86c4464d43267
Parents: d16d467
Author: Sagar <ku...@gmail.com>
Authored: Sun Sep 25 21:53:57 2016 +0530
Committer: Sagar <ku...@gmail.com>
Committed: Sun Sep 25 21:53:57 2016 +0530
----------------------------------------------------------------------
.../taverna/mobile/ui/DownloadingFragment.java | 62 ++++++++++++++++++++
.../main/res/layout/fragment_downloading.xml | 31 ++++++++++
2 files changed, 93 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/b4d37257/app/src/main/java/org/apache/taverna/mobile/ui/DownloadingFragment.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/DownloadingFragment.java b/app/src/main/java/org/apache/taverna/mobile/ui/DownloadingFragment.java
new file mode 100644
index 0000000..dae1cc5
--- /dev/null
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/DownloadingFragment.java
@@ -0,0 +1,62 @@
+package org.apache.taverna.mobile.ui;
+
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v4.app.Fragment;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import org.apache.taverna.mobile.R;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+
+
+public class DownloadingFragment extends Fragment {
+
+ private static final String ARGS_MESSAGE = "args_message";
+
+ String message;
+
+ @BindView(R.id.tvMessage)
+ TextView tvMessage;
+
+ public static DownloadingFragment newInstance(String message) {
+
+ Bundle args = new Bundle();
+ args.putString(ARGS_MESSAGE, message);
+ DownloadingFragment fragment = new DownloadingFragment();
+ fragment.setArguments(args);
+ return fragment;
+ }
+
+
+ @Override
+ public void onCreate(@Nullable Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+
+ message = getArguments().getString(ARGS_MESSAGE);
+
+ }
+
+ @Nullable
+ @Override
+ public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable
+ Bundle savedInstanceState) {
+ ViewGroup rootView = (ViewGroup) inflater.inflate(
+ R.layout.fragment_downloading, container, false);
+
+ ButterKnife.bind(this, rootView);
+ return rootView;
+ }
+
+ @Override
+ public void onActivityCreated(@Nullable Bundle savedInstanceState) {
+ super.onActivityCreated(savedInstanceState);
+
+ tvMessage.setText(message);
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/b4d37257/app/src/main/res/layout/fragment_downloading.xml
----------------------------------------------------------------------
diff --git a/app/src/main/res/layout/fragment_downloading.xml b/app/src/main/res/layout/fragment_downloading.xml
new file mode 100644
index 0000000..79e7f28
--- /dev/null
+++ b/app/src/main/res/layout/fragment_downloading.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
+
+
+ <ProgressBar
+ android:id="@+id/progressBar2"
+ style="?android:attr/progressBarStyle"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_centerInParent="true"/>
+
+ <TextView
+ android:id="@+id/tvMessage"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_centerHorizontal="true"
+ android:layout_marginTop="10dp"
+ android:textSize="20sp"
+ android:text="Downloading Workflow"/>
+ <TextView
+ android:id="@+id/textView4"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_centerHorizontal="true"
+ android:layout_marginTop="10dp"
+ android:textSize="18sp"
+ android:layout_below="@id/tvMessage"
+ android:text="Please Wait ..."/>
+</RelativeLayout>
\ No newline at end of file
[02/50] [abbrv] incubator-taverna-mobile git commit: add fab margin
in dimens
Posted by ia...@apache.org.
add fab margin in dimens
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/093bf6cb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/093bf6cb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/093bf6cb
Branch: refs/heads/master
Commit: 093bf6cbc225129d69da84fbcb57aa5bda999746
Parents: 63402bd
Author: Sagar <ku...@gmail.com>
Authored: Sun Aug 28 22:34:52 2016 +0530
Committer: Sagar <ku...@gmail.com>
Committed: Sun Aug 28 22:34:52 2016 +0530
----------------------------------------------------------------------
app/src/main/res/values/dimens.xml | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/093bf6cb/app/src/main/res/values/dimens.xml
----------------------------------------------------------------------
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 20dc847..43778ec 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -24,4 +24,5 @@ limitations under the License.
https://developer.android.com/design/patterns/navigation-drawer.html -->
<dimen name="navigation_drawer_width">240dp</dimen>
<dimen name="item_offset">3dp</dimen>
+ <dimen name="fab_margin">16dp</dimen>
</resources>
[10/50] [abbrv] incubator-taverna-mobile git commit: add player
workflow java bean
Posted by ia...@apache.org.
add player workflow java bean
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/50385430
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/50385430
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/50385430
Branch: refs/heads/master
Commit: 50385430d9e3053a62e35f16ff7bc1854652a395
Parents: ee9448c
Author: Sagar <ku...@gmail.com>
Authored: Sat Sep 24 11:33:45 2016 +0530
Committer: Sagar <ku...@gmail.com>
Committed: Sat Sep 24 11:33:45 2016 +0530
----------------------------------------------------------------------
.../mobile/data/model/InputsAttribute.java | 63 +++++++++++++++
.../mobile/data/model/PlayerWorkflow.java | 52 ++++++++++++
.../mobile/data/model/PlayerWorkflowDetail.java | 52 ++++++++++++
.../apache/taverna/mobile/data/model/Run.java | 84 ++++++++++++++++++++
4 files changed, 251 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/50385430/app/src/main/java/org/apache/taverna/mobile/data/model/InputsAttribute.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/data/model/InputsAttribute.java b/app/src/main/java/org/apache/taverna/mobile/data/model/InputsAttribute.java
new file mode 100644
index 0000000..ca42a53
--- /dev/null
+++ b/app/src/main/java/org/apache/taverna/mobile/data/model/InputsAttribute.java
@@ -0,0 +1,63 @@
+package org.apache.taverna.mobile.data.model;
+
+import android.os.Parcel;
+import android.os.Parcelable;
+
+import com.google.gson.annotations.Expose;
+import com.google.gson.annotations.SerializedName;
+
+public class InputsAttribute implements Parcelable {
+
+ @SerializedName("name")
+ @Expose
+ private String name;
+
+ @SerializedName("value")
+ @Expose
+ private Object value;
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public Object getValue() {
+ return value;
+ }
+
+ public void setValue(Object value) {
+ this.value = value;
+ }
+
+ @Override
+ public int describeContents() {
+ return 0;
+ }
+
+ @Override
+ public void writeToParcel(Parcel dest, int flags) {
+ dest.writeString(this.name);
+ }
+
+ public InputsAttribute() {
+ }
+
+ protected InputsAttribute(Parcel in) {
+ this.name = in.readString();
+ }
+
+ public static final Creator<InputsAttribute> CREATOR = new Creator<InputsAttribute>() {
+ @Override
+ public InputsAttribute createFromParcel(Parcel source) {
+ return new InputsAttribute(source);
+ }
+
+ @Override
+ public InputsAttribute[] newArray(int size) {
+ return new InputsAttribute[size];
+ }
+ };
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/50385430/app/src/main/java/org/apache/taverna/mobile/data/model/PlayerWorkflow.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/data/model/PlayerWorkflow.java b/app/src/main/java/org/apache/taverna/mobile/data/model/PlayerWorkflow.java
new file mode 100644
index 0000000..b57f2e8
--- /dev/null
+++ b/app/src/main/java/org/apache/taverna/mobile/data/model/PlayerWorkflow.java
@@ -0,0 +1,52 @@
+package org.apache.taverna.mobile.data.model;
+
+import android.os.Parcel;
+import android.os.Parcelable;
+
+import com.google.gson.annotations.Expose;
+import com.google.gson.annotations.SerializedName;
+
+public class PlayerWorkflow implements Parcelable {
+
+ @SerializedName("id")
+ @Expose
+ private Integer id;
+
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ @Override
+ public int describeContents() {
+ return 0;
+ }
+
+ @Override
+ public void writeToParcel(Parcel dest, int flags) {
+ dest.writeValue(this.id);
+ }
+
+ public PlayerWorkflow() {
+ }
+
+ protected PlayerWorkflow(Parcel in) {
+ this.id = (Integer) in.readValue(Integer.class.getClassLoader());
+ }
+
+ public static final Parcelable.Creator<PlayerWorkflow> CREATOR = new Parcelable
+ .Creator<PlayerWorkflow>() {
+ @Override
+ public PlayerWorkflow createFromParcel(Parcel source) {
+ return new PlayerWorkflow(source);
+ }
+
+ @Override
+ public PlayerWorkflow[] newArray(int size) {
+ return new PlayerWorkflow[size];
+ }
+ };
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/50385430/app/src/main/java/org/apache/taverna/mobile/data/model/PlayerWorkflowDetail.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/data/model/PlayerWorkflowDetail.java b/app/src/main/java/org/apache/taverna/mobile/data/model/PlayerWorkflowDetail.java
new file mode 100644
index 0000000..323be42
--- /dev/null
+++ b/app/src/main/java/org/apache/taverna/mobile/data/model/PlayerWorkflowDetail.java
@@ -0,0 +1,52 @@
+package org.apache.taverna.mobile.data.model;
+
+import android.os.Parcel;
+import android.os.Parcelable;
+
+import com.google.gson.annotations.Expose;
+import com.google.gson.annotations.SerializedName;
+
+public class PlayerWorkflowDetail implements Parcelable {
+
+ @SerializedName("run")
+ @Expose
+ private Run run;
+
+ public Run getRun() {
+ return run;
+ }
+
+ public void setRun(Run run) {
+ this.run = run;
+ }
+
+ @Override
+ public int describeContents() {
+ return 0;
+ }
+
+ @Override
+ public void writeToParcel(Parcel dest, int flags) {
+ dest.writeParcelable(this.run, flags);
+ }
+
+ public PlayerWorkflowDetail() {
+ }
+
+ protected PlayerWorkflowDetail(Parcel in) {
+ this.run = in.readParcelable(Run.class.getClassLoader());
+ }
+
+ public static final Parcelable.Creator<PlayerWorkflowDetail> CREATOR = new Parcelable
+ .Creator<PlayerWorkflowDetail>() {
+ @Override
+ public PlayerWorkflowDetail createFromParcel(Parcel source) {
+ return new PlayerWorkflowDetail(source);
+ }
+
+ @Override
+ public PlayerWorkflowDetail[] newArray(int size) {
+ return new PlayerWorkflowDetail[size];
+ }
+ };
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/50385430/app/src/main/java/org/apache/taverna/mobile/data/model/Run.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/data/model/Run.java b/app/src/main/java/org/apache/taverna/mobile/data/model/Run.java
new file mode 100644
index 0000000..d48dd69
--- /dev/null
+++ b/app/src/main/java/org/apache/taverna/mobile/data/model/Run.java
@@ -0,0 +1,84 @@
+package org.apache.taverna.mobile.data.model;
+
+import android.os.Parcel;
+import android.os.Parcelable;
+
+import com.google.gson.annotations.Expose;
+import com.google.gson.annotations.SerializedName;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class Run implements Parcelable {
+
+ @SerializedName("workflow_id")
+ @Expose
+ private Integer workflowId;
+
+ @SerializedName("name")
+ @Expose
+ private String name;
+
+ @SerializedName("inputs_attributes")
+ @Expose
+ private List<InputsAttribute> inputsAttributes = new ArrayList<InputsAttribute>();
+
+ public Integer getWorkflowId() {
+ return workflowId;
+ }
+
+ public void setWorkflowId(Integer workflowId) {
+ this.workflowId = workflowId;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public List<InputsAttribute> getInputsAttributes() {
+ return inputsAttributes;
+ }
+
+ public void setInputsAttributes(List<InputsAttribute> inputsAttributes) {
+ this.inputsAttributes = inputsAttributes;
+ }
+
+
+ @Override
+ public int describeContents() {
+ return 0;
+ }
+
+ @Override
+ public void writeToParcel(Parcel dest, int flags) {
+ dest.writeValue(this.workflowId);
+ dest.writeString(this.name);
+ dest.writeList(this.inputsAttributes);
+ }
+
+ public Run() {
+ }
+
+ protected Run(Parcel in) {
+ this.workflowId = (Integer) in.readValue(Integer.class.getClassLoader());
+ this.name = in.readString();
+ this.inputsAttributes = new ArrayList<InputsAttribute>();
+ in.readList(this.inputsAttributes, InputsAttribute.class.getClassLoader());
+ }
+
+ public static final Parcelable.Creator<Run> CREATOR = new Parcelable.Creator<Run>() {
+ @Override
+ public Run createFromParcel(Parcel source) {
+ return new Run(source);
+ }
+
+ @Override
+ public Run[] newArray(int size) {
+ return new Run[size];
+ }
+ };
+}
\ No newline at end of file
[05/50] [abbrv] incubator-taverna-mobile git commit: add play icon
Posted by ia...@apache.org.
add play icon
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/48a4992a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/48a4992a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/48a4992a
Branch: refs/heads/master
Commit: 48a4992a1325026fae182748e59b875eba15bf51
Parents: fcd4dff
Author: Sagar <ku...@gmail.com>
Authored: Fri Sep 9 12:01:16 2016 +0530
Committer: Sagar <ku...@gmail.com>
Committed: Fri Sep 9 12:01:16 2016 +0530
----------------------------------------------------------------------
.../res/drawable-hdpi/ic_play_arrow_black_24dp.png | Bin 0 -> 194 bytes
.../res/drawable-mdpi/ic_play_arrow_black_24dp.png | Bin 0 -> 150 bytes
.../res/drawable-xhdpi/ic_play_arrow_black_24dp.png | Bin 0 -> 208 bytes
.../res/drawable-xxhdpi/ic_play_arrow_black_24dp.png | Bin 0 -> 265 bytes
.../drawable-xxxhdpi/ic_play_arrow_black_24dp.png | Bin 0 -> 320 bytes
5 files changed, 0 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/48a4992a/app/src/main/res/drawable-hdpi/ic_play_arrow_black_24dp.png
----------------------------------------------------------------------
diff --git a/app/src/main/res/drawable-hdpi/ic_play_arrow_black_24dp.png b/app/src/main/res/drawable-hdpi/ic_play_arrow_black_24dp.png
new file mode 100644
index 0000000..e9c288c
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_play_arrow_black_24dp.png differ
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/48a4992a/app/src/main/res/drawable-mdpi/ic_play_arrow_black_24dp.png
----------------------------------------------------------------------
diff --git a/app/src/main/res/drawable-mdpi/ic_play_arrow_black_24dp.png b/app/src/main/res/drawable-mdpi/ic_play_arrow_black_24dp.png
new file mode 100644
index 0000000..d78c57b
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_play_arrow_black_24dp.png differ
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/48a4992a/app/src/main/res/drawable-xhdpi/ic_play_arrow_black_24dp.png
----------------------------------------------------------------------
diff --git a/app/src/main/res/drawable-xhdpi/ic_play_arrow_black_24dp.png b/app/src/main/res/drawable-xhdpi/ic_play_arrow_black_24dp.png
new file mode 100644
index 0000000..f208795
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_play_arrow_black_24dp.png differ
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/48a4992a/app/src/main/res/drawable-xxhdpi/ic_play_arrow_black_24dp.png
----------------------------------------------------------------------
diff --git a/app/src/main/res/drawable-xxhdpi/ic_play_arrow_black_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_play_arrow_black_24dp.png
new file mode 100644
index 0000000..5345ee3
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_play_arrow_black_24dp.png differ
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/48a4992a/app/src/main/res/drawable-xxxhdpi/ic_play_arrow_black_24dp.png
----------------------------------------------------------------------
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_play_arrow_black_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_play_arrow_black_24dp.png
new file mode 100644
index 0000000..d12d495
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_play_arrow_black_24dp.png differ
[42/50] [abbrv] incubator-taverna-mobile git commit: reset player
login on player's url change
Posted by ia...@apache.org.
reset player login on player's url change
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/a932d6d1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/a932d6d1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/a932d6d1
Branch: refs/heads/master
Commit: a932d6d1578f37e3826d6f464474352be8051508
Parents: 9af7041
Author: Sagar <ku...@gmail.com>
Authored: Tue Sep 27 15:11:25 2016 +0530
Committer: Sagar <ku...@gmail.com>
Committed: Tue Sep 27 15:11:25 2016 +0530
----------------------------------------------------------------------
.../apache/taverna/mobile/activities/SettingsActivity.java | 7 +++++++
1 file changed, 7 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/a932d6d1/app/src/main/java/org/apache/taverna/mobile/activities/SettingsActivity.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/activities/SettingsActivity.java b/app/src/main/java/org/apache/taverna/mobile/activities/SettingsActivity.java
index 7c9638c..95f3f87 100644
--- a/app/src/main/java/org/apache/taverna/mobile/activities/SettingsActivity.java
+++ b/app/src/main/java/org/apache/taverna/mobile/activities/SettingsActivity.java
@@ -33,6 +33,8 @@ import android.support.v4.app.NavUtils;
import android.view.MenuItem;
import org.apache.taverna.mobile.R;
+import org.apache.taverna.mobile.TavernaApplication;
+import org.apache.taverna.mobile.data.local.PreferencesHelper;
import java.util.List;
@@ -73,6 +75,11 @@ public class SettingsActivity extends PreferenceActivity {
} else {
// For all other preferences, set the summary to the value's
// simple string representation.
+ if(preference.getKey().equals(PreferencesHelper.PREF_KEY_PLAYER_URL)){
+
+ new PreferencesHelper(TavernaApplication.getContext())
+ .setUserPlayerLoggedInFlag(false);
+ }
preference.setSummary(stringValue);
}
return true;
[21/50] [abbrv] incubator-taverna-mobile git commit: add NonSwipeable
ViewPager in utils
Posted by ia...@apache.org.
add NonSwipeable ViewPager in utils
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/1c6bb697
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/1c6bb697
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/1c6bb697
Branch: refs/heads/master
Commit: 1c6bb697d117bb258b60dfea7cee58c6d0a69fe8
Parents: 0e4e196
Author: Sagar <ku...@gmail.com>
Authored: Sun Sep 25 21:55:09 2016 +0530
Committer: Sagar <ku...@gmail.com>
Committed: Sun Sep 25 21:55:09 2016 +0530
----------------------------------------------------------------------
.../mobile/utils/NonSwipeableViewPager.java | 59 ++++++++++++++++++++
1 file changed, 59 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/1c6bb697/app/src/main/java/org/apache/taverna/mobile/utils/NonSwipeableViewPager.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/utils/NonSwipeableViewPager.java b/app/src/main/java/org/apache/taverna/mobile/utils/NonSwipeableViewPager.java
new file mode 100644
index 0000000..9d721b5
--- /dev/null
+++ b/app/src/main/java/org/apache/taverna/mobile/utils/NonSwipeableViewPager.java
@@ -0,0 +1,59 @@
+package org.apache.taverna.mobile.utils;
+
+import android.content.Context;
+import android.support.v4.view.ViewPager;
+import android.util.AttributeSet;
+import android.view.MotionEvent;
+import android.view.animation.DecelerateInterpolator;
+import android.widget.Scroller;
+
+import java.lang.reflect.Field;
+
+public class NonSwipeableViewPager extends ViewPager {
+
+ public NonSwipeableViewPager(Context context) {
+ super(context);
+ setMyScroller();
+ }
+
+ public NonSwipeableViewPager(Context context, AttributeSet attrs) {
+ super(context, attrs);
+ setMyScroller();
+ }
+
+ @Override
+ public boolean onInterceptTouchEvent(MotionEvent event) {
+ // Never allow swiping to switch between pages
+ return false;
+ }
+
+ @Override
+ public boolean onTouchEvent(MotionEvent event) {
+ // Never allow swiping to switch between pages
+ return false;
+ }
+
+ //down one is added for smooth scrolling
+
+ private void setMyScroller() {
+ try {
+ Class<?> viewpager = ViewPager.class;
+ Field scroller = viewpager.getDeclaredField("mScroller");
+ scroller.setAccessible(true);
+ scroller.set(this, new MyScroller(getContext()));
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+ public class MyScroller extends Scroller {
+ public MyScroller(Context context) {
+ super(context, new DecelerateInterpolator());
+ }
+
+ @Override
+ public void startScroll(int startX, int startY, int dx, int dy, int duration) {
+ super.startScroll(startX, startY, dx, dy, 350 /*1 secs*/);
+ }
+ }
+}
\ No newline at end of file
[20/50] [abbrv] incubator-taverna-mobile git commit: add methods in
data manager
Posted by ia...@apache.org.
add methods in data manager
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/0e4e196c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/0e4e196c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/0e4e196c
Branch: refs/heads/master
Commit: 0e4e196ca972079cd0cbc4999387f809bfdab916
Parents: b4d3725
Author: Sagar <ku...@gmail.com>
Authored: Sun Sep 25 21:54:37 2016 +0530
Committer: Sagar <ku...@gmail.com>
Committed: Sun Sep 25 21:54:37 2016 +0530
----------------------------------------------------------------------
.../apache/taverna/mobile/data/DataManager.java | 34 +++++++++++++++++---
1 file changed, 30 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/0e4e196c/app/src/main/java/org/apache/taverna/mobile/data/DataManager.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/data/DataManager.java b/app/src/main/java/org/apache/taverna/mobile/data/DataManager.java
index c9bc757..7bf8011 100644
--- a/app/src/main/java/org/apache/taverna/mobile/data/DataManager.java
+++ b/app/src/main/java/org/apache/taverna/mobile/data/DataManager.java
@@ -23,6 +23,8 @@ import org.apache.taverna.mobile.data.local.PreferencesHelper;
import org.apache.taverna.mobile.data.model.Announcements;
import org.apache.taverna.mobile.data.model.DetailAnnouncement;
import org.apache.taverna.mobile.data.model.License;
+import org.apache.taverna.mobile.data.model.PlayerWorkflow;
+import org.apache.taverna.mobile.data.model.PlayerWorkflowDetail;
import org.apache.taverna.mobile.data.model.User;
import org.apache.taverna.mobile.data.model.Workflow;
import org.apache.taverna.mobile.data.model.Workflows;
@@ -151,7 +153,7 @@ public class DataManager {
/**
* @param credentials is base64 encoded credential
- * @param flagLogin is used to maintain the Remain login or not
+ * @param flagLogin is used to maintain the Remain login or not
* @return User Detail if valid credentials
*/
@@ -176,11 +178,35 @@ public class DataManager {
}
/**
- * @param body is body of
- * @return OkHTTP ResponseBody of requested
+ * @param body is body of upload workflow's detail
+ * @param baseAuth is base64 encoded credential
+ * @return Workflow's ID
*/
- public Observable<ResponseBody> uploadWorkflowContent(RequestBody body, String baseAuth) {
+ public Observable<PlayerWorkflow> uploadWorkflowContent(RequestBody body, String baseAuth) {
return mBaseApiManager.getTavernaPlayerApi().uploadWorkflow(body, baseAuth);
}
+ /**
+ * @param credentials is base64 encoded credential
+ * @param flagLogin is used to maintain the Remain login or not
+ * @return okHTTP ResponseBody
+ */
+
+ public Observable<ResponseBody> authPlayerUserLoginDetail(final String credentials,
+ final boolean flagLogin) {
+ return mBaseApiManager.getTavernaPlayerApi().playerlogin(credentials)
+ .concatMap(new Func1<ResponseBody, Observable<? extends ResponseBody>>() {
+ @Override
+ public Observable<? extends ResponseBody> call(ResponseBody responseBody) {
+
+ return Observable.just(responseBody);
+ }
+ });
+
+ }
+
+ public Observable<PlayerWorkflowDetail> getWorkflowDetail(int id){
+ return mBaseApiManager.getTavernaPlayerApi().getWorkflowDetail(id);
+ }
+
}
\ No newline at end of file
[48/50] [abbrv] incubator-taverna-mobile git commit: add all
suggestion
Posted by ia...@apache.org.
add all suggestion
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/b1a458ad
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/b1a458ad
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/b1a458ad
Branch: refs/heads/master
Commit: b1a458ad8a80b4d252ff94ef92b179246cd7a8f2
Parents: 3809ea2
Author: Sagar <ku...@gmail.com>
Authored: Thu Sep 29 23:03:23 2016 +0530
Committer: Sagar <ku...@gmail.com>
Committed: Thu Sep 29 23:03:23 2016 +0530
----------------------------------------------------------------------
.../apache/taverna/mobile/data/DataManager.java | 9 +-
.../mobile/data/local/PreferencesHelper.java | 3 -
.../data/remote/TavernaPlayerService.java | 3 +-
.../taverna/mobile/ui/DownloadingFragment.java | 17 +--
.../FavouriteWorkflowDetailFragment.java | 10 +-
.../ui/playerlogin/PlayerLoginFragment.java | 23 +---
.../ui/playerlogin/PlayerLoginMvpView.java | 2 +-
.../ui/playerlogin/PlayerLoginPresenter.java | 5 +-
.../workflowdetail/WorkflowDetailFragment.java | 20 ++--
.../ui/workflowrun/WorkflowRunActivity.java | 25 +++--
.../apache/taverna/mobile/utils/Constants.java | 27 +++++
.../apache/taverna/mobile/utils/WebViewGen.java | 111 ------------------
.../taverna/mobile/utils/WebViewGenerator.java | 112 +++++++++++++++++++
.../res/layout/fragment_detail_workflow.xml | 8 +-
.../main/res/layout/fragment_downloading.xml | 5 +-
.../res/layout/fragment_player_login_layout.xml | 4 +-
app/src/main/res/values/strings.xml | 17 +++
17 files changed, 208 insertions(+), 193 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/b1a458ad/app/src/main/java/org/apache/taverna/mobile/data/DataManager.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/data/DataManager.java b/app/src/main/java/org/apache/taverna/mobile/data/DataManager.java
index 5171763..56dc3d2 100644
--- a/app/src/main/java/org/apache/taverna/mobile/data/DataManager.java
+++ b/app/src/main/java/org/apache/taverna/mobile/data/DataManager.java
@@ -195,14 +195,7 @@ public class DataManager {
public Observable<ResponseBody> authPlayerUserLoginDetail(final String credentials,
final boolean flagLogin) {
- return mBaseApiManager.getTavernaPlayerApi().playerlogin(credentials)
- .concatMap(new Func1<ResponseBody, Observable<? extends ResponseBody>>() {
- @Override
- public Observable<? extends ResponseBody> call(ResponseBody responseBody) {
-
- return Observable.just(responseBody);
- }
- });
+ return mBaseApiManager.getTavernaPlayerApi().playerlogin(credentials);
}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/b1a458ad/app/src/main/java/org/apache/taverna/mobile/data/local/PreferencesHelper.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/data/local/PreferencesHelper.java b/app/src/main/java/org/apache/taverna/mobile/data/local/PreferencesHelper.java
index 04241c6..41d29e3 100644
--- a/app/src/main/java/org/apache/taverna/mobile/data/local/PreferencesHelper.java
+++ b/app/src/main/java/org/apache/taverna/mobile/data/local/PreferencesHelper.java
@@ -183,14 +183,11 @@ public class PreferencesHelper {
}
public void setUserPlayerLoggedInFlagAndCredential(Boolean flag, String credential) {
-
mPref.edit().putBoolean(PREF_KEY_PLAYER_LOGGED_IN, flag).apply();
-
mPref.edit().putString(PREF_KEY_PLAYER_CREDENTIAL, credential).apply();
}
public void setUserPlayerLoggedInFlag(Boolean flag) {
-
mPref.edit().putBoolean(PREF_KEY_PLAYER_LOGGED_IN, flag).apply();
}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/b1a458ad/app/src/main/java/org/apache/taverna/mobile/data/remote/TavernaPlayerService.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/data/remote/TavernaPlayerService.java b/app/src/main/java/org/apache/taverna/mobile/data/remote/TavernaPlayerService.java
index 1a21f6b..e71ea38 100644
--- a/app/src/main/java/org/apache/taverna/mobile/data/remote/TavernaPlayerService.java
+++ b/app/src/main/java/org/apache/taverna/mobile/data/remote/TavernaPlayerService.java
@@ -43,8 +43,7 @@ public interface TavernaPlayerService {
String authorization);
@POST("/users/sign_in")
- @Headers({
- APIEndPoint.XML_ACCEPT_HEADER})
+ @Headers({APIEndPoint.XML_ACCEPT_HEADER})
Observable<ResponseBody> playerlogin(@Header("Authorization") String
authorization);
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/b1a458ad/app/src/main/java/org/apache/taverna/mobile/ui/DownloadingFragment.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/DownloadingFragment.java b/app/src/main/java/org/apache/taverna/mobile/ui/DownloadingFragment.java
index a2eb05f..3a44fb3 100644
--- a/app/src/main/java/org/apache/taverna/mobile/ui/DownloadingFragment.java
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/DownloadingFragment.java
@@ -27,6 +27,7 @@ import android.view.ViewGroup;
import android.widget.TextView;
import org.apache.taverna.mobile.R;
+import org.apache.taverna.mobile.utils.Constants;
import butterknife.BindView;
import butterknife.ButterKnife;
@@ -34,17 +35,17 @@ import butterknife.ButterKnife;
public class DownloadingFragment extends Fragment {
- private static final String ARGS_MESSAGE = "args_message";
- String message;
+
+ private String message;
@BindView(R.id.tvMessage)
- TextView tvMessage;
+ TextView tv_Message;
public static DownloadingFragment newInstance(String message) {
Bundle args = new Bundle();
- args.putString(ARGS_MESSAGE, message);
+ args.putString(Constants.ARGS_MESSAGE, message);
DownloadingFragment fragment = new DownloadingFragment();
fragment.setArguments(args);
return fragment;
@@ -54,9 +55,9 @@ public class DownloadingFragment extends Fragment {
@Override
public void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
-
- message = getArguments().getString(ARGS_MESSAGE);
-
+ if(getArguments()!=null) {
+ message = getArguments().getString(Constants.ARGS_MESSAGE);
+ }
}
@Nullable
@@ -74,7 +75,7 @@ public class DownloadingFragment extends Fragment {
public void onActivityCreated(@Nullable Bundle savedInstanceState) {
super.onActivityCreated(savedInstanceState);
- tvMessage.setText(message);
+ tv_Message.setText(message);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/b1a458ad/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflowdetail/FavouriteWorkflowDetailFragment.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflowdetail/FavouriteWorkflowDetailFragment.java b/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflowdetail/FavouriteWorkflowDetailFragment.java
index 7ca26a9..f217b6c 100644
--- a/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflowdetail/FavouriteWorkflowDetailFragment.java
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflowdetail/FavouriteWorkflowDetailFragment.java
@@ -41,7 +41,6 @@ import android.widget.ProgressBar;
import android.widget.RelativeLayout;
import android.widget.ScrollView;
import android.widget.TextView;
-import android.widget.Toast;
import com.bumptech.glide.Glide;
import com.bumptech.glide.load.engine.DiskCacheStrategy;
@@ -179,15 +178,10 @@ public class FavouriteWorkflowDetailFragment extends Fragment
@OnClick(R.id.fabRun)
- void fabRunClick(View v) {
- if (mWorkflow.getType().getContent().equals("Taverna 2")) {
+ void fabClickRunWorkflow(View v) {
Intent intent = new Intent(getActivity(), WorkflowRunActivity.class);
intent.putExtra(WorkflowRunActivity.WORKFLOW_URL, mWorkflow.getContentUri());
startActivity(intent);
- } else {
- Toast.makeText(getActivity(), "We can only run Taverna 2 workflow", Toast
- .LENGTH_LONG).show();
- }
}
@OnClick(R.id.ivWorkflowImage)
@@ -265,7 +259,7 @@ public class FavouriteWorkflowDetailFragment extends Fragment
licenceId = workflow.getLicenseType().getId();
}
- if (mWorkflow.getType().getContent().equals("Taverna 2")) {
+ if (mWorkflow.getType().getContent().equals(getString(R.string.t2_workflow_type))) {
fabRun.setVisibility(View.VISIBLE);
}else {
fabRun.setVisibility(View.GONE);
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/b1a458ad/app/src/main/java/org/apache/taverna/mobile/ui/playerlogin/PlayerLoginFragment.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/playerlogin/PlayerLoginFragment.java b/app/src/main/java/org/apache/taverna/mobile/ui/playerlogin/PlayerLoginFragment.java
index 0d74489..324d2a6 100644
--- a/app/src/main/java/org/apache/taverna/mobile/ui/playerlogin/PlayerLoginFragment.java
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/playerlogin/PlayerLoginFragment.java
@@ -97,20 +97,11 @@ public class PlayerLoginFragment extends Fragment implements PlayerLoginMvpView,
public void onActivityCreated(@Nullable Bundle savedInstanceState) {
super.onActivityCreated(savedInstanceState);
-
mEditTextEmail.addTextChangedListener(new CustomTextWatcher(mEditTextEmail));
-
-
- mEditTextPassword.addTextChangedListener(new CustomTextWatcher(mEditTextPassword));
-
mEditTextEmail.setOnFocusChangeListener(this);
+ mEditTextPassword.addTextChangedListener(new CustomTextWatcher(mEditTextPassword));
mEditTextPassword.setOnFocusChangeListener(this);
-
-
- //mPlayerLoginPresenter.PlayerLogin("kumarsagar15795@gmail.com", "Sagarishere", true);
-
-
}
@@ -133,17 +124,17 @@ public class PlayerLoginFragment extends Fragment implements PlayerLoginMvpView,
} else {
- showError("Please enter valid credential");
+ showError(R.string.error_vaild_credential);
}
} else {
- showError("NO Internet Connection");
+ showError(R.string.no_internet);
}
}
@Override
- public void showError(String string) {
- final Snackbar snackbar = Snackbar.make(mEditTextPassword, string, Snackbar
+ public void showError(int stringID) {
+ final Snackbar snackbar = Snackbar.make(mEditTextPassword, getString(stringID), Snackbar
.LENGTH_LONG);
snackbar.setAction("OK", new View.OnClickListener() {
@Override
@@ -171,10 +162,8 @@ public class PlayerLoginFragment extends Fragment implements PlayerLoginMvpView,
private void validateEmail() {
if (mEditTextEmail.getText().toString().trim().isEmpty()) {
-
mTextInputEmail.setError(getString(R.string.err_login_email));
} else {
-
mTextInputEmail.setError(null);
}
@@ -190,10 +179,8 @@ public class PlayerLoginFragment extends Fragment implements PlayerLoginMvpView,
private void validatePassword() {
if (mEditTextPassword.getText().toString().trim().isEmpty()) {
-
mTextInputPassword.setError(getString(R.string.err_login_password));
} else {
-
mTextInputPassword.setError(null);
}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/b1a458ad/app/src/main/java/org/apache/taverna/mobile/ui/playerlogin/PlayerLoginMvpView.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/playerlogin/PlayerLoginMvpView.java b/app/src/main/java/org/apache/taverna/mobile/ui/playerlogin/PlayerLoginMvpView.java
index d3840ee..4b4d84d 100644
--- a/app/src/main/java/org/apache/taverna/mobile/ui/playerlogin/PlayerLoginMvpView.java
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/playerlogin/PlayerLoginMvpView.java
@@ -23,7 +23,7 @@ import org.apache.taverna.mobile.ui.base.MvpView;
public interface PlayerLoginMvpView extends MvpView {
- void showError(String string);
+ void showError(int stringID);
void showCredentialError();
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/b1a458ad/app/src/main/java/org/apache/taverna/mobile/ui/playerlogin/PlayerLoginPresenter.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/playerlogin/PlayerLoginPresenter.java b/app/src/main/java/org/apache/taverna/mobile/ui/playerlogin/PlayerLoginPresenter.java
index 25c8fea..8113cbd 100644
--- a/app/src/main/java/org/apache/taverna/mobile/ui/playerlogin/PlayerLoginPresenter.java
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/playerlogin/PlayerLoginPresenter.java
@@ -21,6 +21,7 @@ package org.apache.taverna.mobile.ui.playerlogin;
import android.util.Base64;
import android.util.Log;
+import org.apache.taverna.mobile.R;
import org.apache.taverna.mobile.data.DataManager;
import org.apache.taverna.mobile.ui.base.BasePresenter;
@@ -81,14 +82,14 @@ public class PlayerLoginPresenter extends BasePresenter<PlayerLoginMvpView> {
getEncodedCredential(username, password));
} else {
- getMvpView().showError("Server Error");
+ getMvpView().showError(R.string.servererr);
}
}
}
@Override
public void onNext(ResponseBody responseBody) {
- Log.e(TAG, "onCompleted: " + responseBody.byteStream());
+ Log.d(TAG, "onCompleted: " + responseBody.byteStream());
}
});
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/b1a458ad/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailFragment.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailFragment.java b/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailFragment.java
index b435986..094511e 100644
--- a/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailFragment.java
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailFragment.java
@@ -40,7 +40,6 @@ import android.widget.ProgressBar;
import android.widget.RelativeLayout;
import android.widget.ScrollView;
import android.widget.TextView;
-import android.widget.Toast;
import com.bumptech.glide.Glide;
import com.bumptech.glide.load.engine.DiskCacheStrategy;
@@ -173,15 +172,12 @@ public class WorkflowDetailFragment extends Fragment implements WorkflowDetailMv
@OnClick(R.id.fabRun)
- void fabRunClick(View v) {
- if (mWorkflow.getType().getContent().equals("Taverna 2")) {
- Intent intent = new Intent(getActivity(), WorkflowRunActivity.class);
- intent.putExtra(WorkflowRunActivity.WORKFLOW_URL, mWorkflow.getContentUri());
- startActivity(intent);
- } else {
- Toast.makeText(getActivity(), "We can only run Taverna 2 workflow", Toast
- .LENGTH_LONG).show();
- }
+ void fabClickRunWorkflow(View v) {
+
+ Intent intent = new Intent(getActivity(), WorkflowRunActivity.class);
+ intent.putExtra(WorkflowRunActivity.WORKFLOW_URL, mWorkflow.getContentUri());
+ startActivity(intent);
+
}
@OnClick(R.id.ivWorkflowImage)
@@ -256,9 +252,9 @@ public class WorkflowDetailFragment extends Fragment implements WorkflowDetailMv
licenceId = workflow.getLicenseType().getId();
}
- if (mWorkflow.getType().getContent().equals("Taverna 2")) {
+ if (mWorkflow.getType().getContent().equals(getString(R.string.t2_workflow_type))) {
fabRun.setVisibility(View.VISIBLE);
- }else {
+ } else {
fabRun.setVisibility(View.GONE);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/b1a458ad/app/src/main/java/org/apache/taverna/mobile/ui/workflowrun/WorkflowRunActivity.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/workflowrun/WorkflowRunActivity.java b/app/src/main/java/org/apache/taverna/mobile/ui/workflowrun/WorkflowRunActivity.java
index 1a40847..b96ce16 100644
--- a/app/src/main/java/org/apache/taverna/mobile/ui/workflowrun/WorkflowRunActivity.java
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/workflowrun/WorkflowRunActivity.java
@@ -36,7 +36,7 @@ import org.apache.taverna.mobile.data.local.PreferencesHelper;
import org.apache.taverna.mobile.ui.DownloadingFragment;
import org.apache.taverna.mobile.ui.playerlogin.PlayerLoginFragment;
import org.apache.taverna.mobile.utils.NonSwipeableViewPager;
-import org.apache.taverna.mobile.utils.WebViewGen;
+import org.apache.taverna.mobile.utils.WebViewGenerator;
import butterknife.BindView;
import butterknife.ButterKnife;
@@ -47,15 +47,23 @@ public class WorkflowRunActivity extends FragmentActivity implements WorkflowRun
PlayerLoginFragment.OnSuccessful {
public static final String WORKFLOW_URL = "Workflow_url";
- private final String[] labels = {"Player\nLogin", "Download", "Upload", "Inputs &\n Run"};
+
+ private String[] labels;
+
@BindView(R.id.stepsView)
StepsView mStepsView;
+
@BindView(R.id.viewpager)
NonSwipeableViewPager mPager;
+
int position = 0;
- String workflowRunURL;
+
+ private String workflowRunURL;
+
private DataManager dataManager;
+
private WorkflowRunPresenter mWorkflowRunPresenter;
+
private PagerAdapter mPagerAdapter;
@Override
@@ -72,6 +80,7 @@ public class WorkflowRunActivity extends FragmentActivity implements WorkflowRun
mWorkflowRunPresenter.attachView(this);
+ labels=getResources().getStringArray(R.array.player_run_slider_view_labels);
mStepsView.setCompletedPosition(position % labels.length)
.setLabels(labels)
@@ -139,7 +148,7 @@ public class WorkflowRunActivity extends FragmentActivity implements WorkflowRun
@Override
public void showError() {
- Toast.makeText(this, "Server Error. Please try after sometime", Toast
+ Toast.makeText(this, getString(R.string.servererr), Toast
.LENGTH_LONG).show();
finish();
}
@@ -156,13 +165,11 @@ public class WorkflowRunActivity extends FragmentActivity implements WorkflowRun
case 0:
return PlayerLoginFragment.newInstance();
case 1:
- return DownloadingFragment.newInstance("Downloading Workflow");
+ return DownloadingFragment.newInstance(getString(R.string.downloading_workflow_lable));
case 2:
- return DownloadingFragment.newInstance("Uploading Workflow");
- case 3:
- return WebViewGen.newInstance(workflowRunURL);
+ return DownloadingFragment.newInstance(getString(R.string.uploading_workflow_lable));
default:
- return DownloadingFragment.newInstance("Uploading1+ Workflow");
+ return WebViewGenerator.newInstance(workflowRunURL);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/b1a458ad/app/src/main/java/org/apache/taverna/mobile/utils/Constants.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/utils/Constants.java b/app/src/main/java/org/apache/taverna/mobile/utils/Constants.java
new file mode 100644
index 0000000..bcbff27
--- /dev/null
+++ b/app/src/main/java/org/apache/taverna/mobile/utils/Constants.java
@@ -0,0 +1,27 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.taverna.mobile.utils;
+
+
+public class Constants {
+
+ public static final String ARGS_MESSAGE = "args_message";
+
+ public static final String ARGS_URL = "url";
+}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/b1a458ad/app/src/main/java/org/apache/taverna/mobile/utils/WebViewGen.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/utils/WebViewGen.java b/app/src/main/java/org/apache/taverna/mobile/utils/WebViewGen.java
deleted file mode 100644
index 96cceac..0000000
--- a/app/src/main/java/org/apache/taverna/mobile/utils/WebViewGen.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.taverna.mobile.utils;
-
-import android.graphics.Bitmap;
-import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.webkit.WebView;
-import android.webkit.WebViewClient;
-import android.widget.ProgressBar;
-
-import org.apache.taverna.mobile.R;
-
-public class WebViewGen extends Fragment {
- private static final String PARAM1 = "url";
- private int flag;
- private ProgressBar progressBar;
- private WebView web;
- private String url;
-
- public static WebViewGen newInstance(String URL) {
-
- Bundle args = new Bundle();
- args.putString(PARAM1, URL);
- WebViewGen fragment = new WebViewGen();
- fragment.setArguments(args);
- return fragment;
- }
-
- @Override
- public void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- if (getArguments() != null) {
- url = getArguments().getString(PARAM1);
- }
- }
-
- @Nullable
- @Override
- public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle
- savedInstanceState) {
- View layout = inflater.inflate(R.layout.webviewgen, container, false);
-
- web = (WebView) layout.findViewById(R.id.webView);
-
- progressBar = (ProgressBar) layout.findViewById(R.id.progressBar);
-
- web.setWebViewClient(new WebClient());
- web.getSettings().setJavaScriptEnabled(true);
- web.getSettings().setBuiltInZoomControls(true);
- web.loadUrl(url);
- web.canGoBack();
- return layout;
-
- }
-
- private void getServer() {
-
- }
-
-
- public class WebClient extends WebViewClient {
-
-
- @Override
- public void onPageStarted(WebView view, String url, Bitmap favicon) {
-
- super.onPageStarted(view, url, favicon);
-
- }
-
- @Override
- public boolean shouldOverrideUrlLoading(WebView view, String url) {
-
- progressBar.setVisibility(View.VISIBLE);
- view.loadUrl(url);
- return true;
-
- }
-
- @Override
- public void onPageFinished(WebView view, String url) {
-
- super.onPageFinished(view, url);
-
- progressBar.setVisibility(View.GONE);
- }
- }
-
-
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/b1a458ad/app/src/main/java/org/apache/taverna/mobile/utils/WebViewGenerator.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/utils/WebViewGenerator.java b/app/src/main/java/org/apache/taverna/mobile/utils/WebViewGenerator.java
new file mode 100644
index 0000000..79c4c0a
--- /dev/null
+++ b/app/src/main/java/org/apache/taverna/mobile/utils/WebViewGenerator.java
@@ -0,0 +1,112 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.taverna.mobile.utils;
+
+import android.graphics.Bitmap;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v4.app.Fragment;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.webkit.WebView;
+import android.webkit.WebViewClient;
+import android.widget.ProgressBar;
+
+import org.apache.taverna.mobile.R;
+
+public class WebViewGenerator extends Fragment {
+
+ private ProgressBar progressBar;
+
+ private WebView web;
+
+ private String url;
+
+ public static WebViewGenerator newInstance(String URL) {
+
+ Bundle args = new Bundle();
+ args.putString(Constants.ARGS_URL, URL);
+ WebViewGenerator fragment = new WebViewGenerator();
+ fragment.setArguments(args);
+ return fragment;
+ }
+
+ @Override
+ public void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ if (getArguments() != null) {
+ url = getArguments().getString(Constants.ARGS_URL);
+ }
+ }
+
+ @Nullable
+ @Override
+ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle
+ savedInstanceState) {
+ View layout = inflater.inflate(R.layout.webviewgen, container, false);
+
+ web = (WebView) layout.findViewById(R.id.webView);
+
+ progressBar = (ProgressBar) layout.findViewById(R.id.progressBar);
+
+ web.setWebViewClient(new WebClient());
+ web.getSettings().setJavaScriptEnabled(true);
+ web.getSettings().setBuiltInZoomControls(true);
+ web.loadUrl(url);
+ web.canGoBack();
+ return layout;
+
+ }
+
+ private void getServer() {
+
+ }
+
+
+ public class WebClient extends WebViewClient {
+
+
+ @Override
+ public void onPageStarted(WebView view, String url, Bitmap favicon) {
+
+ super.onPageStarted(view, url, favicon);
+
+ }
+
+ @Override
+ public boolean shouldOverrideUrlLoading(WebView view, String url) {
+
+ progressBar.setVisibility(View.VISIBLE);
+ view.loadUrl(url);
+ return true;
+
+ }
+
+ @Override
+ public void onPageFinished(WebView view, String url) {
+
+ super.onPageFinished(view, url);
+
+ progressBar.setVisibility(View.GONE);
+ }
+ }
+
+
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/b1a458ad/app/src/main/res/layout/fragment_detail_workflow.xml
----------------------------------------------------------------------
diff --git a/app/src/main/res/layout/fragment_detail_workflow.xml b/app/src/main/res/layout/fragment_detail_workflow.xml
index 83348a4..d202268 100644
--- a/app/src/main/res/layout/fragment_detail_workflow.xml
+++ b/app/src/main/res/layout/fragment_detail_workflow.xml
@@ -73,7 +73,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="10dp"
- android:text="title"
android:textColor="@android:color/black"
android:textSize="20sp"/>
@@ -101,7 +100,6 @@
android:id="@+id/tvUploaderName"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="name"
android:textColor="@android:color/black"
android:textSize="18sp"/>
@@ -109,8 +107,7 @@
android:id="@+id/tvDate"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_alignParentBottom="true"
- android:text="Date"/>
+ android:layout_alignParentBottom="true"/>
<TextView
android:id="@+id/tvType"
@@ -122,8 +119,7 @@
android:paddingEnd="10dp"
android:paddingLeft="0dp"
android:paddingRight="10dp"
- android:paddingStart="0dp"
- android:text="type"/>
+ android:paddingStart="0dp"/>
</RelativeLayout>
</LinearLayout>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/b1a458ad/app/src/main/res/layout/fragment_downloading.xml
----------------------------------------------------------------------
diff --git a/app/src/main/res/layout/fragment_downloading.xml b/app/src/main/res/layout/fragment_downloading.xml
index 108afc7..5558946 100644
--- a/app/src/main/res/layout/fragment_downloading.xml
+++ b/app/src/main/res/layout/fragment_downloading.xml
@@ -36,8 +36,7 @@ limitations under the License.
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_marginTop="10dp"
- android:textSize="20sp"
- android:text="Downloading Workflow"/>
+ android:textSize="20sp"/>
<TextView
android:id="@+id/textView4"
android:layout_width="wrap_content"
@@ -46,5 +45,5 @@ limitations under the License.
android:layout_marginTop="10dp"
android:textSize="18sp"
android:layout_below="@id/tvMessage"
- android:text="Please Wait ..."/>
+ android:text="@string/please_wait"/>
</RelativeLayout>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/b1a458ad/app/src/main/res/layout/fragment_player_login_layout.xml
----------------------------------------------------------------------
diff --git a/app/src/main/res/layout/fragment_player_login_layout.xml b/app/src/main/res/layout/fragment_player_login_layout.xml
index ea87d99..594fb6f 100644
--- a/app/src/main/res/layout/fragment_player_login_layout.xml
+++ b/app/src/main/res/layout/fragment_player_login_layout.xml
@@ -31,7 +31,7 @@ limitations under the License.
android:layout_height="wrap_content"
android:gravity="center"
android:textSize="24sp"
- android:text="Taverna Player Portal Login"/>
+ android:text="@string/headline_taverna_player_portal_login"/>
<android.support.design.widget.TextInputLayout
android:layout_below="@id/header"
@@ -79,7 +79,7 @@ limitations under the License.
android:id="@+id/bLogin"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:text="Login"
+ android:text="@string/button_text_login"
android:layout_marginTop="20dp"
android:layout_below="@id/cbRemember"/>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/b1a458ad/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 fea986f..14f4948 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -122,4 +122,21 @@ limitations under the License.
<string name="err_login_password">Enter valid password</string>
<string name="my_workflows">My Workflows</string>
<string name="no_my_workflow">You have not created any workflow yet !!!!!</string>
+ <string name="error_vaild_credential">Please enter valid credential</string>
+ <string name="t2_workflow_type">Taverna 2</string>
+
+
+ <string-array name="player_run_slider_view_labels">
+ <item>Player \nLogin</item>
+ <item>Download</item>
+ <item>Upload</item>
+ <item>Inputs &\nRun</item>
+ </string-array>
+
+ <string name="downloading_workflow_lable">Downloading Workflow</string>
+ <string name="uploading_workflow_lable">Uploading Workflow</string>
+ <string name="please_wait">Please Wait ...</string>
+ <string name="headline_taverna_player_portal_login">Taverna Player Portal Login</string>
+ <string name="button_text_login">Login</string>
+
</resources>
[14/50] [abbrv] incubator-taverna-mobile git commit: update travis
Posted by ia...@apache.org.
update travis
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/81b1a7a2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/81b1a7a2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/81b1a7a2
Branch: refs/heads/master
Commit: 81b1a7a2ea3d93b4d765cde86638357e9e3fd10f
Parents: 0f48388
Author: Sagar <ku...@gmail.com>
Authored: Sat Sep 24 15:00:18 2016 +0530
Committer: Sagar <ku...@gmail.com>
Committed: Sat Sep 24 15:00:18 2016 +0530
----------------------------------------------------------------------
.travis.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/81b1a7a2/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index d770ab6..b3a826d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,7 +16,7 @@
## under the License.
language: android
-jdk: oraclejdk7
+jdk: oraclejdk8
android:
components:
- tools
[03/50] [abbrv] incubator-taverna-mobile git commit: add fab button
in detail workflow to run workflow
Posted by ia...@apache.org.
add fab button in detail workflow to run workflow
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/3fd55f3e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/3fd55f3e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/3fd55f3e
Branch: refs/heads/master
Commit: 3fd55f3e1aec217704e82f53958de6f6e703012d
Parents: 093bf6c
Author: Sagar <ku...@gmail.com>
Authored: Sun Aug 28 22:35:28 2016 +0530
Committer: Sagar <ku...@gmail.com>
Committed: Sun Aug 28 22:35:28 2016 +0530
----------------------------------------------------------------------
.../res/layout/fragment_detail_workflow.xml | 117 +++++++++++--------
1 file changed, 70 insertions(+), 47 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/3fd55f3e/app/src/main/res/layout/fragment_detail_workflow.xml
----------------------------------------------------------------------
diff --git a/app/src/main/res/layout/fragment_detail_workflow.xml b/app/src/main/res/layout/fragment_detail_workflow.xml
index 2b58f8c..e249565 100644
--- a/app/src/main/res/layout/fragment_detail_workflow.xml
+++ b/app/src/main/res/layout/fragment_detail_workflow.xml
@@ -15,123 +15,146 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<RelativeLayout
- xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:app="http://schemas.android.com/apk/res-auto"
+<android.support.design.widget.CoordinatorLayout
+ android:id="@+id/coords_wrapper"
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
+
+ <RelativeLayout
android:id="@+id/rootLayout"
- android:orientation="vertical"
android:layout_width="match_parent"
- android:layout_height="match_parent">
+ android:layout_height="match_parent"
+ android:orientation="vertical">
- <ProgressBar
+ <ProgressBar
android:id="@+id/progressBar"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"/>
- <ScrollView
+ <ScrollView
android:id="@+id/scrollView"
- android:orientation="vertical"
- android:visibility="gone"
android:layout_width="match_parent"
- android:layout_height="match_parent">
- <LinearLayout
+ android:layout_height="match_parent"
+ android:orientation="vertical"
+ android:visibility="gone">
+
+ <LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
- <ImageView
+ <ImageView
android:id="@+id/ivWorkflowImage"
- android:src="@mipmap/ic_launcher"
android:layout_width="match_parent"
+ android:layout_height="300dp"
android:scaleType="fitCenter"
- android:layout_height="300dp"/>
- <View
+ android:src="@mipmap/ic_launcher"/>
+
+ <View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/grey_background"/>
- <ImageView
+ <ImageView
android:id="@+id/ivFav"
android:layout_width="40dp"
android:layout_height="40dp"
- android:layout_marginTop="-20dp"
android:layout_gravity="right"
android:layout_marginRight="20dp"
+ android:layout_marginTop="-20dp"
android:background="@drawable/background_fav_button"
app:srcCompat="@drawable/ic_star_border_black_24dp"/>
- <TextView
+ <TextView
android:id="@+id/tvTitle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:text="title"
- android:textSize="20sp"
android:padding="10dp"
- android:textColor="@android:color/black"/>
+ android:text="title"
+ android:textColor="@android:color/black"
+ android:textSize="20sp"/>
- <LinearLayout
- android:layout_marginTop="5dp"
+ <LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:layout_marginTop="5dp"
android:orientation="horizontal">
- <ImageView
+ <ImageView
android:id="@+id/ivUploader"
- android:src="@mipmap/ic_launcher"
- android:paddingLeft="10dp"
android:layout_width="50dp"
- android:layout_height="50dp"/>
+ android:layout_height="50dp"
+ android:paddingLeft="10dp"
+ android:src="@mipmap/ic_launcher"/>
- <RelativeLayout
+ <RelativeLayout
android:layout_width="0dp"
android:layout_height="50dp"
android:layout_marginLeft="10dp"
android:layout_marginStart="10dp"
android:layout_weight="1">
- <TextView
+ <TextView
android:id="@+id/tvUploaderName"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="name"
android:textColor="@android:color/black"
android:textSize="18sp"/>
- <TextView
+
+ <TextView
android:id="@+id/tvDate"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:text="Date"/>
- <TextView
+
+ <TextView
android:id="@+id/tvType"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
- android:text="type"
- android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
- android:paddingRight="10dp"
+ android:layout_alignParentRight="true"
android:paddingEnd="10dp"
+ android:paddingLeft="0dp"
+ android:paddingRight="10dp"
android:paddingStart="0dp"
- android:paddingLeft="0dp"/>
- </RelativeLayout>
+ android:text="type"/>
+ </RelativeLayout>
- </LinearLayout>
- <LinearLayout android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:padding="15dp"
- android:background="@color/grey_background"
- android:orientation="vertical">
- <WebView
+ </LinearLayout>
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:background="@color/grey_background"
+ android:orientation="vertical"
+ android:padding="15dp">
+
+ <WebView
android:id="@+id/tvDescription"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="5dp"
- />
+ />
+ </LinearLayout>
+
</LinearLayout>
- </LinearLayout>
+ </ScrollView>
+ </RelativeLayout>
+
+ <android.support.design.widget.FloatingActionButton
+ android:id="@+id/action_button_location"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="bottom|end"
+ android:layout_margin="@dimen/fab_margin"
+ />
+
- </ScrollView>
-</RelativeLayout>
\ No newline at end of file
+</android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
[07/50] [abbrv] incubator-taverna-mobile git commit: add json accept
header constant
Posted by ia...@apache.org.
add json accept header constant
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/08bdb745
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/08bdb745
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/08bdb745
Branch: refs/heads/master
Commit: 08bdb7452800efecd2873b738217445c1d3a27bd
Parents: e089790
Author: Sagar <ku...@gmail.com>
Authored: Sat Sep 24 11:14:58 2016 +0530
Committer: Sagar <ku...@gmail.com>
Committed: Sat Sep 24 11:14:58 2016 +0530
----------------------------------------------------------------------
.../java/org/apache/taverna/mobile/data/remote/APIEndPoint.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/08bdb745/app/src/main/java/org/apache/taverna/mobile/data/remote/APIEndPoint.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/data/remote/APIEndPoint.java b/app/src/main/java/org/apache/taverna/mobile/data/remote/APIEndPoint.java
index 1d40350..cf0511b 100644
--- a/app/src/main/java/org/apache/taverna/mobile/data/remote/APIEndPoint.java
+++ b/app/src/main/java/org/apache/taverna/mobile/data/remote/APIEndPoint.java
@@ -32,6 +32,7 @@ public class APIEndPoint {
public static final String WHOAMI = "whoami.xml";
public static final String XML_ACCEPT_HEADER = "Accept: application/xml";
+ public static final String JSON_ACCEPT_HEADER = "Accept: application/json";
public static final String JSON_CONTENT_HEADER = "Content-Type: application/json";
public static final String UTF_CONTENT_ENCODING_HEADER = "Content-Encoding: UTF-8";
}
[38/50] [abbrv] incubator-taverna-mobile git commit: get player url
from shared preference
Posted by ia...@apache.org.
get player url from shared preference
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/7df97f4c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/7df97f4c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/7df97f4c
Branch: refs/heads/master
Commit: 7df97f4cee577b5edf7ac80f4635e95bd21eb7a9
Parents: b95c384
Author: Sagar <ku...@gmail.com>
Authored: Tue Sep 27 14:11:52 2016 +0530
Committer: Sagar <ku...@gmail.com>
Committed: Tue Sep 27 14:11:52 2016 +0530
----------------------------------------------------------------------
.../taverna/mobile/data/local/PreferencesHelper.java | 10 +++++++++-
.../apache/taverna/mobile/data/remote/BaseApiManager.java | 6 +++++-
2 files changed, 14 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/7df97f4c/app/src/main/java/org/apache/taverna/mobile/data/local/PreferencesHelper.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/data/local/PreferencesHelper.java b/app/src/main/java/org/apache/taverna/mobile/data/local/PreferencesHelper.java
index 5dd1f9a..28099c9 100644
--- a/app/src/main/java/org/apache/taverna/mobile/data/local/PreferencesHelper.java
+++ b/app/src/main/java/org/apache/taverna/mobile/data/local/PreferencesHelper.java
@@ -21,6 +21,7 @@ package org.apache.taverna.mobile.data.local;
import android.content.Context;
import android.content.SharedPreferences;
+import android.preference.PreferenceManager;
import org.apache.taverna.mobile.data.model.User;
@@ -52,11 +53,16 @@ public class PreferencesHelper {
private static final String PREF_KEY_USER_WEBSITE = "pref_user_website";
private static final String PREF_KEY_PLAYER_CREDENTIAL = "pref_player_credential";
+
+ private static final String PREF_KEY_PLAYER_URL = "pref_player_url";
+
private final SharedPreferences mPref;
+ private final SharedPreferences sharedPref;
public PreferencesHelper(Context context) {
mPref = context.getSharedPreferences(PREF_FILE_NAME, Context.MODE_PRIVATE);
+ sharedPref = PreferenceManager.getDefaultSharedPreferences(context);
}
@@ -187,5 +193,7 @@ public class PreferencesHelper {
return mPref.getString(PREF_KEY_PLAYER_CREDENTIAL, " ");
}
-
+ public String getPlayerURL() {
+ return sharedPref.getString(PREF_KEY_PLAYER_URL, "http://139.59.28.12:3000/");
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/7df97f4c/app/src/main/java/org/apache/taverna/mobile/data/remote/BaseApiManager.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/data/remote/BaseApiManager.java b/app/src/main/java/org/apache/taverna/mobile/data/remote/BaseApiManager.java
index ff22ceb..c17fc72 100644
--- a/app/src/main/java/org/apache/taverna/mobile/data/remote/BaseApiManager.java
+++ b/app/src/main/java/org/apache/taverna/mobile/data/remote/BaseApiManager.java
@@ -18,6 +18,9 @@
*/
package org.apache.taverna.mobile.data.remote;
+import org.apache.taverna.mobile.TavernaApplication;
+import org.apache.taverna.mobile.data.local.PreferencesHelper;
+
import retrofit2.Retrofit;
import retrofit2.adapter.rxjava.RxJavaCallAdapterFactory;
import retrofit2.converter.gson.GsonConverterFactory;
@@ -29,7 +32,8 @@ public class BaseApiManager {
public static final String MY_EXPERIMENT_END_POINT = "http://www.myexperiment.org/";
- public static final String TAVERNA_PLAYER_END_POINT = "http://139.59.28.12:3000/";
+ public static final String TAVERNA_PLAYER_END_POINT = new PreferencesHelper
+ (TavernaApplication.getContext()).getPlayerURL();
/********
* Helper class that sets up a new services with simplexml converter factory
[29/50] [abbrv] incubator-taverna-mobile git commit: add run only for
tavern 2 Workflow
Posted by ia...@apache.org.
add run only for tavern 2 Workflow
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/1600e7b8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/1600e7b8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/1600e7b8
Branch: refs/heads/master
Commit: 1600e7b82922651d52058be59fc0170acb0d4807
Parents: 67035fa
Author: Sagar <ku...@gmail.com>
Authored: Mon Sep 26 14:52:51 2016 +0530
Committer: Sagar <ku...@gmail.com>
Committed: Mon Sep 26 14:52:51 2016 +0530
----------------------------------------------------------------------
.../ui/workflowdetail/WorkflowDetailFragment.java | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/1600e7b8/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailFragment.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailFragment.java b/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailFragment.java
index 2b3ff30..d2970e7 100644
--- a/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailFragment.java
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailFragment.java
@@ -39,6 +39,7 @@ import android.widget.ProgressBar;
import android.widget.RelativeLayout;
import android.widget.ScrollView;
import android.widget.TextView;
+import android.widget.Toast;
import com.bumptech.glide.Glide;
import com.bumptech.glide.load.engine.DiskCacheStrategy;
@@ -168,10 +169,15 @@ public class WorkflowDetailFragment extends Fragment implements WorkflowDetailMv
@OnClick(R.id.fabRun)
- void fabRunClick(View v){
- Intent intent = new Intent(getActivity(), WorkflowRunActivity.class);
- intent.putExtra(WorkflowRunActivity.WORKFLOW_URL,mWorkflow.getContentUri());
- startActivity(intent);
+ void fabRunClick(View v) {
+ if (mWorkflow.getType().getContent().toUpperCase().equals("Taverna 2".toUpperCase())) {
+ Intent intent = new Intent(getActivity(), WorkflowRunActivity.class);
+ intent.putExtra(WorkflowRunActivity.WORKFLOW_URL, mWorkflow.getContentUri());
+ startActivity(intent);
+ } else {
+ Toast.makeText(getActivity(), "We can only run Taverna 2 workflow", Toast
+ .LENGTH_LONG).show();
+ }
}
@OnClick(R.id.ivWorkflowImage)
[31/50] [abbrv] incubator-taverna-mobile git commit: remove error
Posted by ia...@apache.org.
remove error
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/18cbcf36
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/18cbcf36
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/18cbcf36
Branch: refs/heads/master
Commit: 18cbcf363e948e6971fae5302f76ccf85ef8226a
Parents: 7eb4d3a
Author: Sagar <ku...@gmail.com>
Authored: Mon Sep 26 14:58:22 2016 +0530
Committer: Sagar <ku...@gmail.com>
Committed: Mon Sep 26 14:58:22 2016 +0530
----------------------------------------------------------------------
.../taverna/mobile/ui/workflowrun/WorkflowRunActivity.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/18cbcf36/app/src/main/java/org/apache/taverna/mobile/ui/workflowrun/WorkflowRunActivity.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/workflowrun/WorkflowRunActivity.java b/app/src/main/java/org/apache/taverna/mobile/ui/workflowrun/WorkflowRunActivity.java
index aa1f06d..82038cd 100644
--- a/app/src/main/java/org/apache/taverna/mobile/ui/workflowrun/WorkflowRunActivity.java
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/workflowrun/WorkflowRunActivity.java
@@ -66,7 +66,7 @@ public class WorkflowRunActivity extends FragmentActivity implements WorkflowRun
String workflowRunURL;
- String workflowURL;
+
@Override
protected void onCreate(@Nullable Bundle savedInstanceState) {
@@ -116,7 +116,7 @@ public class WorkflowRunActivity extends FragmentActivity implements WorkflowRun
position =1;
mPager.setCurrentItem(position);
mStepsView.setCompletedPosition(position % labels.length).drawView();
- mWorkflowRunPresenter.runWorkflow("hh");
+ mWorkflowRunPresenter.runWorkflow(getIntent().getStringExtra(WORKFLOW_URL));
}
@Override
[26/50] [abbrv] incubator-taverna-mobile git commit: add generic
WebView fragment
Posted by ia...@apache.org.
add generic WebView fragment
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/d411dae8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/d411dae8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/d411dae8
Branch: refs/heads/master
Commit: d411dae8f75f0a48185f40edbf660c8563eb62e4
Parents: afa295d
Author: Sagar <ku...@gmail.com>
Authored: Mon Sep 26 14:36:15 2016 +0530
Committer: Sagar <ku...@gmail.com>
Committed: Mon Sep 26 14:36:15 2016 +0530
----------------------------------------------------------------------
.../apache/taverna/mobile/utils/WebViewGen.java | 93 ++++++++++++++++++++
app/src/main/res/layout/webviewgen.xml | 20 +++++
2 files changed, 113 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/d411dae8/app/src/main/java/org/apache/taverna/mobile/utils/WebViewGen.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/utils/WebViewGen.java b/app/src/main/java/org/apache/taverna/mobile/utils/WebViewGen.java
new file mode 100644
index 0000000..abb52d2
--- /dev/null
+++ b/app/src/main/java/org/apache/taverna/mobile/utils/WebViewGen.java
@@ -0,0 +1,93 @@
+package org.apache.taverna.mobile.utils;
+
+import android.graphics.Bitmap;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v4.app.Fragment;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.webkit.WebView;
+import android.webkit.WebViewClient;
+import android.widget.ProgressBar;
+
+import org.apache.taverna.mobile.R;
+
+public class WebViewGen extends Fragment {
+ private static final String PARAM1 = "URL";
+ private int flag;
+ private ProgressBar progressBar;
+ private WebView web;
+ private String URL;
+
+ public static WebViewGen newInstance(String URL) {
+
+ Bundle args = new Bundle();
+ args.putString(PARAM1, URL);
+ WebViewGen fragment = new WebViewGen();
+ fragment.setArguments(args);
+ return fragment;
+ }
+
+ @Override
+ public void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ if (getArguments() != null) {
+ URL = getArguments().getString(PARAM1);
+ }
+ }
+
+ @Nullable
+ @Override
+ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle
+ savedInstanceState) {
+ View layout = inflater.inflate(R.layout.webviewgen, container, false);
+
+ web = (WebView) layout.findViewById(R.id.webView);
+
+ progressBar = (ProgressBar) layout.findViewById(R.id.progressBar);
+
+ web.setWebViewClient(new myWebClient());
+ web.getSettings().setJavaScriptEnabled(true);
+ web.getSettings().setBuiltInZoomControls(true);
+ web.loadUrl(URL);
+ web.canGoBack();
+ return layout;
+
+ }
+
+ private void getServer() {
+
+ }
+
+
+ public class myWebClient extends WebViewClient {
+
+
+ @Override
+ public void onPageStarted(WebView view, String url, Bitmap favicon) {
+
+ super.onPageStarted(view, url, favicon);
+
+ }
+
+ @Override
+ public boolean shouldOverrideUrlLoading(WebView view, String url) {
+
+ progressBar.setVisibility(View.VISIBLE);
+ view.loadUrl(url);
+ return true;
+
+ }
+
+ @Override
+ public void onPageFinished(WebView view, String url) {
+
+ super.onPageFinished(view, url);
+
+ progressBar.setVisibility(View.GONE);
+ }
+ }
+
+
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/d411dae8/app/src/main/res/layout/webviewgen.xml
----------------------------------------------------------------------
diff --git a/app/src/main/res/layout/webviewgen.xml b/app/src/main/res/layout/webviewgen.xml
new file mode 100644
index 0000000..212cf39
--- /dev/null
+++ b/app/src/main/res/layout/webviewgen.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
+
+ <WebView
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:id="@+id/webView"
+ />
+
+ <ProgressBar
+
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:id="@+id/progressBar"
+ android:layout_centerVertical="true"
+ android:layout_centerHorizontal="true" />
+
+</RelativeLayout>
\ No newline at end of file
[40/50] [abbrv] incubator-taverna-mobile git commit: get player url
from shared preference
Posted by ia...@apache.org.
get player url from shared preference
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/2d8a1eeb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/2d8a1eeb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/2d8a1eeb
Branch: refs/heads/master
Commit: 2d8a1eeb18277c17f896387d7dacdbe9da17828e
Parents: 03ab156
Author: Sagar <ku...@gmail.com>
Authored: Tue Sep 27 15:09:26 2016 +0530
Committer: Sagar <ku...@gmail.com>
Committed: Tue Sep 27 15:09:26 2016 +0530
----------------------------------------------------------------------
.../taverna/mobile/ui/workflowrun/WorkflowRunActivity.java | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/2d8a1eeb/app/src/main/java/org/apache/taverna/mobile/ui/workflowrun/WorkflowRunActivity.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/workflowrun/WorkflowRunActivity.java b/app/src/main/java/org/apache/taverna/mobile/ui/workflowrun/WorkflowRunActivity.java
index bfb6138..3022449 100644
--- a/app/src/main/java/org/apache/taverna/mobile/ui/workflowrun/WorkflowRunActivity.java
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/workflowrun/WorkflowRunActivity.java
@@ -127,8 +127,13 @@ public class WorkflowRunActivity extends FragmentActivity implements WorkflowRun
@Override
public void setInputsAttribute(int id) {
+ String playerURL=dataManager.getPreferencesHelper().getPlayerURL();
- workflowRunURL = "http://139.59.28.12:3000/workflows/" + id + "/runs/new";
+ if (playerURL.trim().endsWith("/")){
+ playerURL=playerURL.substring(0,playerURL.length()-1);
+ }
+ workflowRunURL = playerURL+"/workflows/" + id +
+ "/runs/new";
mPager.getAdapter().notifyDataSetChanged();
}
[11/50] [abbrv] incubator-taverna-mobile git commit: add play icon on
FAB button
Posted by ia...@apache.org.
add play icon on FAB button
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/3592433d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/3592433d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/3592433d
Branch: refs/heads/master
Commit: 3592433da4fb3142b51a0102fcb73b5c0f988201
Parents: 5038543
Author: Sagar <ku...@gmail.com>
Authored: Sat Sep 24 11:37:36 2016 +0530
Committer: Sagar <ku...@gmail.com>
Committed: Sat Sep 24 11:37:36 2016 +0530
----------------------------------------------------------------------
app/src/main/res/layout/fragment_detail_workflow.xml | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/3592433d/app/src/main/res/layout/fragment_detail_workflow.xml
----------------------------------------------------------------------
diff --git a/app/src/main/res/layout/fragment_detail_workflow.xml b/app/src/main/res/layout/fragment_detail_workflow.xml
index e249565..f5d2847 100644
--- a/app/src/main/res/layout/fragment_detail_workflow.xml
+++ b/app/src/main/res/layout/fragment_detail_workflow.xml
@@ -154,6 +154,7 @@
android:layout_height="wrap_content"
android:layout_gravity="bottom|end"
android:layout_margin="@dimen/fab_margin"
+ android:src="@drawable/ic_play_arrow_black_24dp"
/>
[32/50] [abbrv] incubator-taverna-mobile git commit: remove
checkstyle error
Posted by ia...@apache.org.
remove checkstyle error
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/6168a6eb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/6168a6eb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/6168a6eb
Branch: refs/heads/master
Commit: 6168a6eb3e820ffd4a476ed70cc89638d22a2569
Parents: 18cbcf3
Author: Sagar <ku...@gmail.com>
Authored: Mon Sep 26 15:08:49 2016 +0530
Committer: Sagar <ku...@gmail.com>
Committed: Mon Sep 26 15:08:49 2016 +0530
----------------------------------------------------------------------
.../apache/taverna/mobile/data/DataManager.java | 4 +-
.../mobile/data/local/PreferencesHelper.java | 2 +-
.../mobile/data/remote/BaseApiManager.java | 10 +++--
.../data/remote/TavernaPlayerService.java | 4 +-
.../ui/playerlogin/PlayerLoginFragment.java | 43 ++++++++------------
.../ui/playerlogin/PlayerLoginMvpView.java | 2 +-
.../ui/playerlogin/PlayerLoginPresenter.java | 4 +-
.../ui/workflowrun/WorkflowRunActivity.java | 35 ++++++----------
.../ui/workflowrun/WorkflowRunPresenter.java | 10 ++---
.../apache/taverna/mobile/utils/WebViewGen.java | 4 +-
10 files changed, 53 insertions(+), 65 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/6168a6eb/app/src/main/java/org/apache/taverna/mobile/data/DataManager.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/data/DataManager.java b/app/src/main/java/org/apache/taverna/mobile/data/DataManager.java
index 7bf8011..5444976 100644
--- a/app/src/main/java/org/apache/taverna/mobile/data/DataManager.java
+++ b/app/src/main/java/org/apache/taverna/mobile/data/DataManager.java
@@ -178,7 +178,7 @@ public class DataManager {
}
/**
- * @param body is body of upload workflow's detail
+ * @param body is body of upload workflow's detail
* @param baseAuth is base64 encoded credential
* @return Workflow's ID
*/
@@ -205,7 +205,7 @@ public class DataManager {
}
- public Observable<PlayerWorkflowDetail> getWorkflowDetail(int id){
+ public Observable<PlayerWorkflowDetail> getWorkflowDetail(int id) {
return mBaseApiManager.getTavernaPlayerApi().getWorkflowDetail(id);
}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/6168a6eb/app/src/main/java/org/apache/taverna/mobile/data/local/PreferencesHelper.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/data/local/PreferencesHelper.java b/app/src/main/java/org/apache/taverna/mobile/data/local/PreferencesHelper.java
index e98a494..5dd1f9a 100644
--- a/app/src/main/java/org/apache/taverna/mobile/data/local/PreferencesHelper.java
+++ b/app/src/main/java/org/apache/taverna/mobile/data/local/PreferencesHelper.java
@@ -184,7 +184,7 @@ public class PreferencesHelper {
}
public String getUserPlayerCredential() {
- return mPref.getString(PREF_KEY_PLAYER_CREDENTIAL," ");
+ return mPref.getString(PREF_KEY_PLAYER_CREDENTIAL, " ");
}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/6168a6eb/app/src/main/java/org/apache/taverna/mobile/data/remote/BaseApiManager.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/data/remote/BaseApiManager.java b/app/src/main/java/org/apache/taverna/mobile/data/remote/BaseApiManager.java
index f6550ea..ff22ceb 100644
--- a/app/src/main/java/org/apache/taverna/mobile/data/remote/BaseApiManager.java
+++ b/app/src/main/java/org/apache/taverna/mobile/data/remote/BaseApiManager.java
@@ -31,7 +31,9 @@ public class BaseApiManager {
public static final String TAVERNA_PLAYER_END_POINT = "http://139.59.28.12:3000/";
- /******** Helper class that sets up a new services with simplexml converter factory *******/
+ /********
+ * Helper class that sets up a new services with simplexml converter factory
+ *******/
private <T> T createSimpleXMLApi(Class<T> clazz, String ENDPOINT) {
@@ -45,7 +47,9 @@ public class BaseApiManager {
return retrofit.create(clazz);
}
- /******** Helper class that sets up a new services with gson converter factory *******/
+ /********
+ * Helper class that sets up a new services with gson converter factory
+ *******/
private <T> T createJsonApi(Class<T> clazz, String ENDPOINT) {
@@ -63,7 +67,7 @@ public class BaseApiManager {
return createSimpleXMLApi(TavernaService.class, MY_EXPERIMENT_END_POINT);
}
- public TavernaPlayerService getTavernaPlayerApi(){
+ public TavernaPlayerService getTavernaPlayerApi() {
return createJsonApi(TavernaPlayerService.class, TAVERNA_PLAYER_END_POINT);
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/6168a6eb/app/src/main/java/org/apache/taverna/mobile/data/remote/TavernaPlayerService.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/data/remote/TavernaPlayerService.java b/app/src/main/java/org/apache/taverna/mobile/data/remote/TavernaPlayerService.java
index 3ad89dd..a1d475a 100644
--- a/app/src/main/java/org/apache/taverna/mobile/data/remote/TavernaPlayerService.java
+++ b/app/src/main/java/org/apache/taverna/mobile/data/remote/TavernaPlayerService.java
@@ -21,8 +21,8 @@ public interface TavernaPlayerService {
APIEndPoint.JSON_CONTENT_HEADER,
APIEndPoint.JSON_ACCEPT_HEADER,
APIEndPoint.UTF_CONTENT_ENCODING_HEADER})
- Observable<PlayerWorkflow> uploadWorkflow(@Body RequestBody body, @Header("Authorization") String
- authorization);
+ Observable<PlayerWorkflow> uploadWorkflow(@Body RequestBody body, @Header("Authorization")
+ String authorization);
@POST("/users/sign_in")
@Headers({
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/6168a6eb/app/src/main/java/org/apache/taverna/mobile/ui/playerlogin/PlayerLoginFragment.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/playerlogin/PlayerLoginFragment.java b/app/src/main/java/org/apache/taverna/mobile/ui/playerlogin/PlayerLoginFragment.java
index 35ebedc..4387870 100644
--- a/app/src/main/java/org/apache/taverna/mobile/ui/playerlogin/PlayerLoginFragment.java
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/playerlogin/PlayerLoginFragment.java
@@ -43,15 +43,10 @@ public class PlayerLoginFragment extends Fragment implements PlayerLoginMvpView,
@BindView(R.id.cbRemember)
CheckBox mCheckBoxRemember;
-
-
+ OnSuccessful mCallback;
private DataManager dataManager;
-
private PlayerLoginPresenter mPlayerLoginPresenter;
- OnSuccessful mCallback;
-
-
public static PlayerLoginFragment newInstance() {
Bundle args = new Bundle();
@@ -98,7 +93,6 @@ public class PlayerLoginFragment extends Fragment implements PlayerLoginMvpView,
//mPlayerLoginPresenter.PlayerLogin("kumarsagar15795@gmail.com", "Sagarishere", true);
-
}
@@ -204,6 +198,23 @@ public class PlayerLoginFragment extends Fragment implements PlayerLoginMvpView,
}
}
+ @Override
+ public void onAttach(Context context) {
+ super.onAttach(context);
+
+ try {
+ mCallback = (OnSuccessful) getActivity();
+ } catch (ClassCastException e) {
+ throw new ClassCastException(getActivity().toString()
+ + " must implement OnSuccessful");
+ }
+ }
+
+
+ public interface OnSuccessful {
+ void onSuccessfulLogin();
+ }
+
private class CustomTextWatcher implements TextWatcher {
private View view;
@@ -231,22 +242,4 @@ public class PlayerLoginFragment extends Fragment implements PlayerLoginMvpView,
}
}
}
-
-
- public interface OnSuccessful {
- void onSuccessfulLogin();
- }
-
-
- @Override
- public void onAttach(Context context) {
- super.onAttach(context);
-
- try {
- mCallback = (OnSuccessful) getActivity();
- } catch (ClassCastException e) {
- throw new ClassCastException(getActivity().toString()
- + " must implement OnSuccessful");
- }
- }
}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/6168a6eb/app/src/main/java/org/apache/taverna/mobile/ui/playerlogin/PlayerLoginMvpView.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/playerlogin/PlayerLoginMvpView.java b/app/src/main/java/org/apache/taverna/mobile/ui/playerlogin/PlayerLoginMvpView.java
index 9e0f9e6..93f6e53 100644
--- a/app/src/main/java/org/apache/taverna/mobile/ui/playerlogin/PlayerLoginMvpView.java
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/playerlogin/PlayerLoginMvpView.java
@@ -3,7 +3,7 @@ package org.apache.taverna.mobile.ui.playerlogin;
import org.apache.taverna.mobile.ui.base.MvpView;
-public interface PlayerLoginMvpView extends MvpView{
+public interface PlayerLoginMvpView extends MvpView {
void showError(String string);
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/6168a6eb/app/src/main/java/org/apache/taverna/mobile/ui/playerlogin/PlayerLoginPresenter.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/playerlogin/PlayerLoginPresenter.java b/app/src/main/java/org/apache/taverna/mobile/ui/playerlogin/PlayerLoginPresenter.java
index 411eca2..dcd0bc6 100644
--- a/app/src/main/java/org/apache/taverna/mobile/ui/playerlogin/PlayerLoginPresenter.java
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/playerlogin/PlayerLoginPresenter.java
@@ -39,7 +39,7 @@ public class PlayerLoginPresenter extends BasePresenter<PlayerLoginMvpView> {
if (mSubscriptions != null) mSubscriptions.unsubscribe();
mSubscriptions = mDataManager.authPlayerUserLoginDetail(getEncodedCredential(username,
- password),loginFlag)
+ password), loginFlag)
.observeOn(AndroidSchedulers.mainThread())
.subscribeOn(Schedulers.io())
.subscribe(new Observer<ResponseBody>() {
@@ -57,7 +57,7 @@ public class PlayerLoginPresenter extends BasePresenter<PlayerLoginMvpView> {
} else if (((HttpException) e).code() == 406) {
getMvpView().validCredential();
mDataManager.getPreferencesHelper().setUserPlayerLoggedInFlag
- (loginFlag,getEncodedCredential(username, password));
+ (loginFlag, getEncodedCredential(username, password));
}
}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/6168a6eb/app/src/main/java/org/apache/taverna/mobile/ui/workflowrun/WorkflowRunActivity.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/workflowrun/WorkflowRunActivity.java b/app/src/main/java/org/apache/taverna/mobile/ui/workflowrun/WorkflowRunActivity.java
index 82038cd..bfb6138 100644
--- a/app/src/main/java/org/apache/taverna/mobile/ui/workflowrun/WorkflowRunActivity.java
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/workflowrun/WorkflowRunActivity.java
@@ -47,26 +47,16 @@ public class WorkflowRunActivity extends FragmentActivity implements WorkflowRun
PlayerLoginFragment.OnSuccessful {
public static final String WORKFLOW_URL = "Workflow_url";
-
-
- private DataManager dataManager;
-
- private WorkflowRunPresenter mWorkflowRunPresenter;
-
+ private final String[] labels = {"Player\nLogin", "Download", "Upload", "Inputs &\n Run"};
@BindView(R.id.stepsView)
StepsView mStepsView;
-
@BindView(R.id.viewpager)
NonSwipeableViewPager mPager;
-
- private PagerAdapter mPagerAdapter;
-
- private final String[] labels = {"Player\nLogin","Download", "Upload", "Inputs &\n Run"};
- int position =0;
-
+ int position = 0;
String workflowRunURL;
-
-
+ private DataManager dataManager;
+ private WorkflowRunPresenter mWorkflowRunPresenter;
+ private PagerAdapter mPagerAdapter;
@Override
protected void onCreate(@Nullable Bundle savedInstanceState) {
@@ -87,7 +77,8 @@ public class WorkflowRunActivity extends FragmentActivity implements WorkflowRun
.setLabels(labels)
.setBarColorIndicator(
getContext().getResources().getColor(R.color.material_blue_grey_800))
- .setProgressColorIndicator(getContext().getResources().getColor(R.color.colorPrimary))
+ .setProgressColorIndicator(getContext().getResources().getColor(R.color
+ .colorPrimary))
.setLabelColorIndicator(getContext().getResources().getColor(R.color.colorPrimary))
.drawView();
@@ -95,7 +86,7 @@ public class WorkflowRunActivity extends FragmentActivity implements WorkflowRun
mPagerAdapter = new ScreenSlidePagerAdapter(getSupportFragmentManager());
mPager.setAdapter(mPagerAdapter);
- if(dataManager.getPreferencesHelper().isUserPlayerLoggedInFlag()){
+ if (dataManager.getPreferencesHelper().isUserPlayerLoggedInFlag()) {
mPager.setCurrentItem(++position);
mStepsView.setCompletedPosition(position % labels.length).drawView();
@@ -113,7 +104,7 @@ public class WorkflowRunActivity extends FragmentActivity implements WorkflowRun
@Override
public void onSuccessfulLogin() {
- position =1;
+ position = 1;
mPager.setCurrentItem(position);
mStepsView.setCompletedPosition(position % labels.length).drawView();
mWorkflowRunPresenter.runWorkflow(getIntent().getStringExtra(WORKFLOW_URL));
@@ -121,14 +112,14 @@ public class WorkflowRunActivity extends FragmentActivity implements WorkflowRun
@Override
public void movetoUploadWorkflow() {
- position =2;
+ position = 2;
mPager.setCurrentItem(position);
mStepsView.setCompletedPosition(position % labels.length).drawView();
}
@Override
public void movetoInputs() {
- position =3;
+ position = 3;
mStepsView.setCompletedPosition(position % labels.length).drawView();
mPager.setCurrentItem(position);
@@ -137,7 +128,7 @@ public class WorkflowRunActivity extends FragmentActivity implements WorkflowRun
@Override
public void setInputsAttribute(int id) {
- workflowRunURL = "http://139.59.28.12:3000/workflows/"+id+"/runs/new";
+ workflowRunURL = "http://139.59.28.12:3000/workflows/" + id + "/runs/new";
mPager.getAdapter().notifyDataSetChanged();
}
@@ -156,7 +147,7 @@ public class WorkflowRunActivity extends FragmentActivity implements WorkflowRun
@Override
public Fragment getItem(int position) {
- switch (position){
+ switch (position) {
case 0:
return PlayerLoginFragment.newInstance();
case 1:
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/6168a6eb/app/src/main/java/org/apache/taverna/mobile/ui/workflowrun/WorkflowRunPresenter.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/workflowrun/WorkflowRunPresenter.java b/app/src/main/java/org/apache/taverna/mobile/ui/workflowrun/WorkflowRunPresenter.java
index ef5686d..72b1fd1 100644
--- a/app/src/main/java/org/apache/taverna/mobile/ui/workflowrun/WorkflowRunPresenter.java
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/workflowrun/WorkflowRunPresenter.java
@@ -77,7 +77,8 @@ public class WorkflowRunPresenter extends BasePresenter<WorkflowRunMvpView> {
StringBuffer sb = new StringBuffer();
String post = "";
- String basicAuth = mDataManager.getPreferencesHelper().getUserPlayerCredential();
+ String basicAuth = mDataManager.getPreferencesHelper()
+ .getUserPlayerCredential();
boolean flag = false;
try {
@@ -130,17 +131,16 @@ public class WorkflowRunPresenter extends BasePresenter<WorkflowRunMvpView> {
@Override
public void onError(Throwable e) {
- getMvpView().showError();
+ getMvpView().showError();
}
@Override
public void onNext(PlayerWorkflowDetail playerWorkflowDetail) {
- getMvpView().setInputsAttribute(playerWorkflowDetail.getRun().getWorkflowId());
+ getMvpView().setInputsAttribute(playerWorkflowDetail.getRun()
+ .getWorkflowId());
}
});
}
-
-
}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/6168a6eb/app/src/main/java/org/apache/taverna/mobile/utils/WebViewGen.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/utils/WebViewGen.java b/app/src/main/java/org/apache/taverna/mobile/utils/WebViewGen.java
index abb52d2..2dd4bc3 100644
--- a/app/src/main/java/org/apache/taverna/mobile/utils/WebViewGen.java
+++ b/app/src/main/java/org/apache/taverna/mobile/utils/WebViewGen.java
@@ -47,7 +47,7 @@ public class WebViewGen extends Fragment {
progressBar = (ProgressBar) layout.findViewById(R.id.progressBar);
- web.setWebViewClient(new myWebClient());
+ web.setWebViewClient(new WebClient());
web.getSettings().setJavaScriptEnabled(true);
web.getSettings().setBuiltInZoomControls(true);
web.loadUrl(URL);
@@ -61,7 +61,7 @@ public class WebViewGen extends Fragment {
}
- public class myWebClient extends WebViewClient {
+ public class WebClient extends WebViewClient {
@Override
[08/50] [abbrv] incubator-taverna-mobile git commit: add multiple
converter
Posted by ia...@apache.org.
add multiple converter
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/c70f85d9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/c70f85d9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/c70f85d9
Branch: refs/heads/master
Commit: c70f85d94b18f3c560fa2d890e5c1d49a3a0d7d2
Parents: 08bdb74
Author: Sagar <ku...@gmail.com>
Authored: Sat Sep 24 11:17:18 2016 +0530
Committer: Sagar <ku...@gmail.com>
Committed: Sat Sep 24 11:17:18 2016 +0530
----------------------------------------------------------------------
.../mobile/data/remote/BaseApiManager.java | 23 ++++++++++++++++----
1 file changed, 19 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/c70f85d9/app/src/main/java/org/apache/taverna/mobile/data/remote/BaseApiManager.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/data/remote/BaseApiManager.java b/app/src/main/java/org/apache/taverna/mobile/data/remote/BaseApiManager.java
index 3628aa3..f6550ea 100644
--- a/app/src/main/java/org/apache/taverna/mobile/data/remote/BaseApiManager.java
+++ b/app/src/main/java/org/apache/taverna/mobile/data/remote/BaseApiManager.java
@@ -20,6 +20,7 @@ package org.apache.taverna.mobile.data.remote;
import retrofit2.Retrofit;
import retrofit2.adapter.rxjava.RxJavaCallAdapterFactory;
+import retrofit2.converter.gson.GsonConverterFactory;
import retrofit2.converter.simplexml.SimpleXmlConverterFactory;
@@ -30,9 +31,9 @@ public class BaseApiManager {
public static final String TAVERNA_PLAYER_END_POINT = "http://139.59.28.12:3000/";
- /******** Helper class that sets up a new services *******/
+ /******** Helper class that sets up a new services with simplexml converter factory *******/
- private <T> T createApi(Class<T> clazz, String ENDPOINT) {
+ private <T> T createSimpleXMLApi(Class<T> clazz, String ENDPOINT) {
Retrofit retrofit = new Retrofit.Builder()
.baseUrl(ENDPOINT)
@@ -44,11 +45,25 @@ public class BaseApiManager {
return retrofit.create(clazz);
}
+ /******** Helper class that sets up a new services with gson converter factory *******/
+
+ private <T> T createJsonApi(Class<T> clazz, String ENDPOINT) {
+
+ Retrofit retrofit = new Retrofit.Builder()
+ .baseUrl(ENDPOINT)
+ .addConverterFactory(GsonConverterFactory.create())
+ .addCallAdapterFactory(RxJavaCallAdapterFactory.create())
+ .client(new TavernaOkHttpClient().getTavernaOkHttpClient())
+ .build();
+
+ return retrofit.create(clazz);
+ }
+
public TavernaService getTavernaApi() {
- return createApi(TavernaService.class, MY_EXPERIMENT_END_POINT);
+ return createSimpleXMLApi(TavernaService.class, MY_EXPERIMENT_END_POINT);
}
public TavernaPlayerService getTavernaPlayerApi(){
- return createApi(TavernaPlayerService.class, TAVERNA_PLAYER_END_POINT);
+ return createJsonApi(TavernaPlayerService.class, TAVERNA_PLAYER_END_POINT);
}
}
\ No newline at end of file