From 6e9331b8929beabf64bfd0aba9da582371e16035 Mon Sep 17 00:00:00 2001 From: Ujjwal Agrawal Date: Tue, 1 May 2018 15:58:40 +0530 Subject: [PATCH] Skip textview added and onclick implemented --- .../java/fr/free/nrw/commons/auth/LoginActivity.java | 8 ++++++++ app/src/main/res/layout/activity_login.xml | 10 ++++++++++ app/src/main/res/values/strings.xml | 1 + 3 files changed, 19 insertions(+) diff --git a/app/src/main/java/fr/free/nrw/commons/auth/LoginActivity.java b/app/src/main/java/fr/free/nrw/commons/auth/LoginActivity.java index 7b2b0a97f..66ab216b0 100644 --- a/app/src/main/java/fr/free/nrw/commons/auth/LoginActivity.java +++ b/app/src/main/java/fr/free/nrw/commons/auth/LoginActivity.java @@ -37,6 +37,7 @@ import javax.inject.Named; import butterknife.BindView; import butterknife.ButterKnife; import butterknife.OnClick; +import fr.free.nrw.commons.AboutActivity; import fr.free.nrw.commons.BuildConfig; import fr.free.nrw.commons.PageTitle; import fr.free.nrw.commons.R; @@ -78,6 +79,7 @@ public class LoginActivity extends AccountAuthenticatorActivity { @BindView(R.id.login_credentials) TextView loginCredentials; @BindView(R.id.two_factor_container) TextInputLayout twoFactorContainer; @BindView(R.id.forgotPassword) HtmlTextView forgotPasswordText; + @BindView(R.id.skipLogin) HtmlTextView skipLoginText; ProgressDialog progressDialog; private AppCompatDelegate delegate; @@ -127,6 +129,7 @@ public class LoginActivity extends AccountAuthenticatorActivity { signupButton.setOnClickListener(view -> signUp()); forgotPasswordText.setOnClickListener(view -> forgotPassword()); + skipLoginText.setOnClickListener(view -> skipLogin()); if(BuildConfig.FLAVOR.equals("beta")){ loginCredentials.setText(getString(R.string.login_credential)); @@ -135,6 +138,11 @@ public class LoginActivity extends AccountAuthenticatorActivity { } } + private void skipLogin() { + NavigationBaseActivity.startActivityWithFlags(this, AboutActivity.class, Intent.FLAG_ACTIVITY_CLEAR_TOP); + finish(); + } + private void forgotPassword() { Utils.handleWebUrl(this, Uri.parse(BuildConfig.FORGOT_PASSWORD_URL)); } diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 5d1345bd3..0470cf720 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -207,6 +207,16 @@ android:layout_marginBottom="@dimen/standard_gap" android:text="@string/forgot_password" /> + + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index efdeeec7e..e853073db 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -270,4 +270,5 @@ Proceed Cancel Retry + Skip