Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Signup redesign #1401

Closed
wants to merge 5 commits into from
Closed

Signup redesign #1401

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
59f53d3
Redesign: Signup page (with java errors)
rchtgpt Aug 9, 2023
c573334
Redesign: Signup page
rchtgpt Aug 10, 2023
734b641
Redesign: Signup page
rchtgpt Aug 10, 2023
e38d104
Redesign: Signup page
rchtgpt Aug 10, 2023
41cbbe5
Merge branch 'redesign-2023' into signup-redesign
rchtgpt Aug 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
212 changes: 106 additions & 106 deletions mifospay/src/main/java/org/mifos/mobilewallet/mifospay/registration/ui/SignupActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
import android.net.Uri;
import android.os.Bundle;
import android.support.design.widget.FloatingActionButton;
import android.support.design.widget.Snackbar;
//import android.support.design.widget.Snackbar;
import android.support.design.widget.TextInputEditText;
import android.support.design.widget.TextInputLayout;
//import android.support.design.widget.TextInputLayout;
import android.support.transition.TransitionManager;
import android.text.Editable;
import android.text.TextWatcher;
Expand All @@ -18,9 +18,9 @@
import android.widget.TextView;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
//import butterknife.OnClick;
import com.mifos.mobile.passcode.utils.PassCodeConstants;
import in.galaxyofandroid.spinerdialog.OnSpinerItemClick;
//import in.galaxyofandroid.spinerdialog.OnSpinerItemClick;
import in.galaxyofandroid.spinerdialog.SpinnerDialog;
import java.util.ArrayList;
import javax.inject.Inject;
Expand All @@ -35,7 +35,7 @@
import org.mifos.mobilewallet.mifospay.utils.Constants;
import org.mifos.mobilewallet.mifospay.utils.DebugUtil;
import org.mifos.mobilewallet.mifospay.utils.Toaster;
import org.mifos.mobilewallet.mifospay.utils.ValidateUtil;
//import org.mifos.mobilewallet.mifospay.utils.ValidateUtil;

import static org.mifos.mobilewallet.mifospay.utils.FileUtils.readJson;

Expand All @@ -45,24 +45,24 @@ public class SignupActivity extends BaseActivity implements RegistrationContract
SignupPresenter mPresenter;

RegistrationContract.SignupPresenter mSignupPresenter;
@BindView(R.id.et_first_name)
TextInputEditText mEtFirstName;
@BindView(R.id.et_last_name)
TextInputEditText mEtLastName;
@BindView(R.id.et_email)
TextInputEditText mEtEmail;
@BindView(R.id.et_business_shop_name)
TextInputEditText mEtBusinessShopName;
@BindView(R.id.et_business_shop_layout)
TextInputLayout mEtBusinessShopLayout;
@BindView(R.id.et_address_line_1)
TextInputEditText mEtAddressLine1;
@BindView(R.id.et_address_line_2)
TextInputEditText mEtAddressLine2;
@BindView(R.id.et_pin_code)
TextInputEditText mEtPinCode;
@BindView(R.id.et_state)
TextInputEditText mEtCity;
// @BindView(R.id.et_first_name)
// TextInputEditText mEtFirstName;
// @BindView(R.id.et_last_name)
// TextInputEditText mEtLastName;
// @BindView(R.id.et_email)
// TextInputEditText mEtEmail;
// @BindView(R.id.et_business_shop_name)
// TextInputEditText mEtBusinessShopName;
// @BindView(R.id.et_business_shop_layout)
// TextInputLayout mEtBusinessShopLayout;
// @BindView(R.id.et_address_line_1)
// TextInputEditText mEtAddressLine1;
// @BindView(R.id.et_address_line_2)
// TextInputEditText mEtAddressLine2;
// @BindView(R.id.et_pin_code)
// TextInputEditText mEtPinCode;
// @BindView(R.id.et_state)
// TextInputEditText mEtCity;
@BindView(R.id.fab_next)
FloatingActionButton mFabNext;

Expand Down Expand Up @@ -101,12 +101,12 @@ protected void onCreate(Bundle savedInstanceState) {
setToolbarTitle("Registration");

mifosSavingProductId = getIntent().getIntExtra(Constants.MIFOS_SAVINGS_PRODUCT_ID, 0);
if (mifosSavingProductId
== org.mifos.mobilewallet.core.utils.Constants.MIFOS_MERCHANT_SAVINGS_PRODUCT_ID) {
mEtBusinessShopLayout.setVisibility(View.VISIBLE);
} else {
mEtBusinessShopLayout.setVisibility(View.GONE);
}
// if (mifosSavingProductId
// == org.mifos.mobilewallet.core.utils.Constants.MIFOS_MERCHANT_SAVINGS_PRODUCT_ID) {
// mEtBusinessShopLayout.setVisibility(View.VISIBLE);
// } else {
// mEtBusinessShopLayout.setVisibility(View.GONE);
// }
mobileNumber = getIntent().getStringExtra(Constants.MOBILE_NUMBER);
countryName = getIntent().getStringExtra(Constants.COUNTRY);

Expand All @@ -116,19 +116,19 @@ protected void onCreate(Bundle savedInstanceState) {
String lastName = getIntent().getStringExtra(Constants.GOOGLE_FAMILY_NAME);
Uri photoUri = getIntent().getParcelableExtra(Constants.GOOGLE_PHOTO_URI);

if (displayName != null) {
mEtBusinessShopName.setText(displayName);
}
if (email != null) {
mEtEmail.setText(email);
mEtUserName.setText(email.substring(0, email.indexOf('@')));
}
if (firstName != null) {
mEtFirstName.setText(firstName);
}
if (lastName != null) {
mEtLastName.setText(lastName);
}
// if (displayName != null) {
// mEtBusinessShopName.setText(displayName);
// }
// if (email != null) {
// mEtEmail.setText(email);
// mEtUserName.setText(email.substring(0, email.indexOf('@')));
// }
// if (firstName != null) {
// mEtFirstName.setText(firstName);
// }
// if (lastName != null) {
// mEtLastName.setText(lastName);
// }

mEtPassword.addTextChangedListener(new TextWatcher() {
@Override
Expand Down Expand Up @@ -179,19 +179,19 @@ private void initSearchableStateSpinner() {
spinnerDialog = new SpinnerDialog(SignupActivity.this, statesList,
"Select or Search State", R.style.DialogAnimations_SmileWindow, "Close");

spinnerDialog.bindOnSpinerListener(new OnSpinerItemClick() {
@Override
public void onClick(String item, int position) {
mEtCity.setText(item);
}
});
// spinnerDialog.bindOnSpinerListener(new OnSpinerItemClick() {
// @Override
// public void onClick(String item, int position) {
// mEtCity.setText(item);
// }
// });

mEtCity.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
spinnerDialog.showSpinerDialog();
}
});
// mEtCity.setOnClickListener(new View.OnClickListener() {
// @Override
// public void onClick(View v) {
// spinnerDialog.showSpinerDialog();
// }
// });

hideProgressDialog();

Expand All @@ -205,58 +205,58 @@ public void setPresenter(RegistrationContract.SignupPresenter presenter) {
mSignupPresenter = presenter;
}

@OnClick(R.id.fab_next)
public void onNextClicked() {
showProgressDialog(Constants.PLEASE_WAIT);

if (mifosSavingProductId
== org.mifos.mobilewallet.core.utils.Constants.MIFOS_MERCHANT_SAVINGS_PRODUCT_ID
&& isEmpty(mEtBusinessShopName)) {
Toaster.showToast(this, "All fields are mandatory");
hideProgressDialog();
return;
}
if (isEmpty(mEtFirstName) || isEmpty(mEtLastName) || isEmpty(mEtEmail)
|| isEmpty(mEtAddressLine1) || isEmpty(mEtAddressLine2)
|| isEmpty(mEtPinCode) || isEmpty(mEtCity) || isEmpty(mEtUserName) || isEmpty(
mEtPassword) || isEmpty(mEtConfirmPassword)) {
Toaster.showToast(this, "All fields are mandatory");
hideProgressDialog();
return;
}
if (mEtPassword.getText().toString().length() < 6) {
showToast("Password should contain more than 6 characters");
return;
}

String firstName = mEtFirstName.getText().toString().trim();
String lastName = mEtLastName.getText().toString().trim();
String email = mEtEmail.getText().toString().trim();
String businessName = mEtBusinessShopName.getText().toString().trim();
String addressline1 = mEtAddressLine1.getText().toString().trim();
String addressline2 = mEtAddressLine2.getText().toString().trim();
String pincode = mEtPinCode.getText().toString().trim();
String city = mEtCity.getText().toString().trim();
String username = mEtUserName.getText().toString().trim();
String password = mEtPassword.getText().toString();
String confirmPassword = mEtConfirmPassword.getText().toString();

if (!ValidateUtil.INSTANCE.isValidEmail(email)) {
Snackbar.make(container, R.string.validate_email, Snackbar.LENGTH_SHORT).show();
hideProgressDialog();
return;
}

if (!password.equals(confirmPassword)) {
Toaster.showToast(this, "Password is not same as Confirm Password");
hideProgressDialog();
return;
}

mSignupPresenter.registerUser(firstName, lastName, mobileNumber, email, businessName,
addressline1, addressline2, pincode, city, countryName, username, password, stateId,
countryId, mifosSavingProductId);
}
// @OnClick(R.id.fab_next)
// public void onNextClicked() {
// showProgressDialog(Constants.PLEASE_WAIT);
//
// if (mifosSavingProductId
// == org.mifos.mobilewallet.core.utils.Constants.MIFOS_MERCHANT_SAVINGS_PRODUCT_ID
// && isEmpty(mEtBusinessShopName)) {
// Toaster.showToast(this, "All fields are mandatory");
// hideProgressDialog();
// return;
// }
// if (isEmpty(mEtFirstName) || isEmpty(mEtLastName) || isEmpty(mEtEmail)
// || isEmpty(mEtAddressLine1) || isEmpty(mEtAddressLine2)
// || isEmpty(mEtPinCode) || isEmpty(mEtCity) || isEmpty(mEtUserName) || isEmpty(
// mEtPassword) || isEmpty(mEtConfirmPassword)) {
// Toaster.showToast(this, "All fields are mandatory");
// hideProgressDialog();
// return;
// }
// if (mEtPassword.getText().toString().length() < 6) {
// showToast("Password should contain more than 6 characters");
// return;
// }
//
// String firstName = mEtFirstName.getText().toString().trim();
// String lastName = mEtLastName.getText().toString().trim();
// String email = mEtEmail.getText().toString().trim();
// String businessName = mEtBusinessShopName.getText().toString().trim();
// String addressline1 = mEtAddressLine1.getText().toString().trim();
// String addressline2 = mEtAddressLine2.getText().toString().trim();
// String pincode = mEtPinCode.getText().toString().trim();
// String city = mEtCity.getText().toString().trim();
// String username = mEtUserName.getText().toString().trim();
// String password = mEtPassword.getText().toString();
// String confirmPassword = mEtConfirmPassword.getText().toString();
//
// if (!ValidateUtil.INSTANCE.isValidEmail(email)) {
// Snackbar.make(container, R.string.validate_email, Snackbar.LENGTH_SHORT).show();
// hideProgressDialog();
// return;
// }
//
// if (!password.equals(confirmPassword)) {
// Toaster.showToast(this, "Password is not same as Confirm Password");
// hideProgressDialog();
// return;
// }
//
// mSignupPresenter.registerUser(firstName, lastName, mobileNumber, email, businessName,
// addressline1, addressline2, pincode, city, countryName, username, password, stateId,
// countryId, mifosSavingProductId);
// }

@Override
public void onRegisterSuccess(String s) {
Expand Down
Loading
Loading