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/08/09 11:23:03 UTC
[17/28] incubator-taverna-mobile git commit: add progress dialog
add progress dialog
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/f1de3b1f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/f1de3b1f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/f1de3b1f
Branch: refs/heads/master
Commit: f1de3b1f577f4396a90b9109cc4b3e25deb2989b
Parents: 46e56b9
Author: Sagar <ku...@gmail.com>
Authored: Tue Aug 2 23:33:04 2016 +0530
Committer: Sagar <lu...@Sagar.local>
Committed: Tue Aug 2 23:33:04 2016 +0530
----------------------------------------------------------------------
.../taverna/mobile/ui/login/LoginFragment.java | 16 ++++++++++++++++
.../taverna/mobile/ui/login/LoginMvpView.java | 2 ++
.../taverna/mobile/ui/login/LoginPresenter.java | 6 +++++-
3 files changed, 23 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/f1de3b1f/app/src/main/java/org/apache/taverna/mobile/ui/login/LoginFragment.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/login/LoginFragment.java b/app/src/main/java/org/apache/taverna/mobile/ui/login/LoginFragment.java
index 6d40b9c..1f99a0d 100644
--- a/app/src/main/java/org/apache/taverna/mobile/ui/login/LoginFragment.java
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/login/LoginFragment.java
@@ -1,6 +1,7 @@
package org.apache.taverna.mobile.ui.login;
+import android.app.ProgressDialog;
import android.content.Intent;
import android.os.Bundle;
import android.support.annotation.Nullable;
@@ -47,6 +48,8 @@ public class LoginFragment extends Fragment implements LoginMvpView, View.OnFocu
private LoginPresenter mLoginPresenter;
private ConnectionInfo mConnectionInfo;
+ private ProgressDialog progressDialog;
+
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@@ -81,6 +84,10 @@ public class LoginFragment extends Fragment implements LoginMvpView, View.OnFocu
mEditTextPassword.setOnFocusChangeListener(this);
+ progressDialog = new ProgressDialog(getContext());
+
+ progressDialog.setMessage("Please wait");
+
}
@@ -145,6 +152,15 @@ public class LoginFragment extends Fragment implements LoginMvpView, View.OnFocu
}
@Override
+ public void showProgressDialog(boolean flag) {
+ if (flag) {
+ progressDialog.show();
+ }else {
+ progressDialog.cancel();
+ }
+ }
+
+ @Override
public void moveToWorkflowList() {
startActivity(new Intent(getActivity(), DashboardMainActivity.class));
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/f1de3b1f/app/src/main/java/org/apache/taverna/mobile/ui/login/LoginMvpView.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/login/LoginMvpView.java b/app/src/main/java/org/apache/taverna/mobile/ui/login/LoginMvpView.java
index cdd7237..c27aadf 100644
--- a/app/src/main/java/org/apache/taverna/mobile/ui/login/LoginMvpView.java
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/login/LoginMvpView.java
@@ -10,4 +10,6 @@ public interface LoginMvpView extends MvpView {
void showCredentialError();
void showError(String string);
+
+ void showProgressDialog(boolean flag);
}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/f1de3b1f/app/src/main/java/org/apache/taverna/mobile/ui/login/LoginPresenter.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/login/LoginPresenter.java b/app/src/main/java/org/apache/taverna/mobile/ui/login/LoginPresenter.java
index 4900735..3979a98 100644
--- a/app/src/main/java/org/apache/taverna/mobile/ui/login/LoginPresenter.java
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/login/LoginPresenter.java
@@ -38,19 +38,23 @@ public class LoginPresenter extends BasePresenter<LoginMvpView> {
public void login(String username, String password, boolean flagLogin) {
if (mSubscriptions != null) mSubscriptions.unsubscribe();
+ getMvpView().showProgressDialog(true);
+
mSubscriptions = mDataManager.getLoginUserDetail(getEncodedCredential(username, password)
- ,flagLogin)
+ , flagLogin)
.observeOn(AndroidSchedulers.mainThread())
.subscribeOn(Schedulers.io())
.subscribe(new Observer<User>() {
@Override
public void onCompleted() {
getMvpView().moveToWorkflowList();
+ getMvpView().showProgressDialog(false);
}
@Override
public void onError(Throwable e) {
getMvpView().showCredentialError();
+ getMvpView().showProgressDialog(false);
}
@Override