move to dashboard on successful login
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/bb4d8060 Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/bb4d8060 Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/bb4d8060 Branch: refs/heads/master Commit: bb4d8060201d7548f5f06b2828f637a3c63c39c4 Parents: 679e84f Author: Sagar <[email protected]> Authored: Mon Aug 1 12:24:43 2016 +0530 Committer: Sagar <[email protected]> Committed: Mon Aug 1 12:24:43 2016 +0530 ---------------------------------------------------------------------- .../apache/taverna/mobile/ui/login/LoginActivity.java | 2 +- .../apache/taverna/mobile/ui/login/LoginFragment.java | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/bb4d8060/app/src/main/java/org/apache/taverna/mobile/ui/login/LoginActivity.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/login/LoginActivity.java b/app/src/main/java/org/apache/taverna/mobile/ui/login/LoginActivity.java index 0022082..7246a0d 100644 --- a/app/src/main/java/org/apache/taverna/mobile/ui/login/LoginActivity.java +++ b/app/src/main/java/org/apache/taverna/mobile/ui/login/LoginActivity.java @@ -40,7 +40,7 @@ public class LoginActivity extends AppCompatActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_login); - //getSupportActionBar().hide(); + if (savedInstanceState == null) { getSupportFragmentManager().beginTransaction() .add(R.id.container, new LoginFragment()) http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/bb4d8060/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 df3e96e..dc818ef 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.content.Intent; import android.os.Bundle; import android.support.annotation.Nullable; import android.support.design.widget.Snackbar; @@ -15,6 +16,7 @@ import android.view.WindowManager; import android.widget.EditText; import org.apache.taverna.mobile.R; +import org.apache.taverna.mobile.activities.DashboardMainActivity; import org.apache.taverna.mobile.data.DataManager; import org.apache.taverna.mobile.data.model.User; import org.apache.taverna.mobile.utils.ConnectionInfo; @@ -81,10 +83,10 @@ public class LoginFragment extends Fragment implements LoginMvpView, View.OnFocu private void validateEmail() { if (mEditTextEmail.getText().toString().trim().isEmpty()) { - mTextInputEmail.setError(getString(R.string.err_login_email)); - + mTextInputEmail.setError(getString(R.string.err_login_email)); } else { + mTextInputEmail.setError(null); } @@ -94,9 +96,10 @@ public class LoginFragment extends Fragment implements LoginMvpView, View.OnFocu private void validatePassword() { if (mEditTextPassword.getText().toString().trim().isEmpty()) { - mTextInputPassword.setError(getString(R.string.err_login_password)); + mTextInputPassword.setError(getString(R.string.err_login_password)); } else { + mTextInputPassword.setError(null); } @@ -139,6 +142,8 @@ public class LoginFragment extends Fragment implements LoginMvpView, View.OnFocu @Override public void moveToWorkflowList() { + startActivity(new Intent(getActivity(), DashboardMainActivity.class)); + getActivity().finish(); } @Override
