support integrated address (excl. qr code) (#147)

UI & code tweaks
This commit is contained in:
m2049r
2017-12-05 07:48:59 +01:00
committed by GitHub
parent 22b4905828
commit 82c32d4442
14 changed files with 186 additions and 70 deletions
@@ -41,6 +41,8 @@ import timber.log.Timber;
public class SendAddressWizardFragment extends SendWizardFragment {
static final int INTEGRATED_ADDRESS_LENGTH = 106;
public static SendAddressWizardFragment newInstance(Listener listener) {
SendAddressWizardFragment instance = new SendAddressWizardFragment();
instance.setSendListener(listener);
@@ -67,6 +69,8 @@ public class SendAddressWizardFragment extends SendWizardFragment {
private TextInputLayout etPaymentId;
private Button bPaymentId;
private CardView cvScan;
private View tvPaymentIdIntegrated;
private View llPaymentId;
private String scannedAmount = null;
@@ -85,8 +89,50 @@ public class SendAddressWizardFragment extends SendWizardFragment {
View view = inflater.inflate(R.layout.fragment_send_address, container, false);
tvPaymentIdIntegrated = view.findViewById(R.id.tvPaymentIdIntegrated);
llPaymentId = view.findViewById(R.id.llPaymentId);
etAddress = (TextInputLayout) view.findViewById(R.id.etAddress);
etAddress.getEditText().setRawInputType(InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS);
etAddress.getEditText().setOnEditorActionListener(new TextView.OnEditorActionListener() {
public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
if ((event != null && (event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) || (actionId == EditorInfo.IME_ACTION_NEXT)) {
if (checkAddress()) {
if (llPaymentId.getVisibility() == View.VISIBLE) {
etPaymentId.requestFocus();
} else {
etDummy.requestFocus();
Helper.hideKeyboard(getActivity());
}
}
return true;
}
return false;
}
});
etAddress.getEditText().addTextChangedListener(new TextWatcher() {
@Override
public void afterTextChanged(Editable editable) {
if ((etAddress.getEditText().getText().toString().length() == INTEGRATED_ADDRESS_LENGTH) &&
checkAddressNoError()) { // we have an integrated address
etPaymentId.getEditText().getText().clear();
llPaymentId.setVisibility(View.GONE);
tvPaymentIdIntegrated.setVisibility(View.VISIBLE);
} else { // we don't
llPaymentId.setVisibility(View.VISIBLE);
tvPaymentIdIntegrated.setVisibility(View.GONE);
}
}
@Override
public void beforeTextChanged(CharSequence s, int start, int count, int after) {
}
@Override
public void onTextChanged(CharSequence s, int start, int before, int count) {
}
});
etPaymentId = (TextInputLayout) view.findViewById(R.id.etPaymentId);
etPaymentId.getEditText().setRawInputType(InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS);
@@ -157,13 +203,24 @@ public class SendAddressWizardFragment extends SendWizardFragment {
return ok;
}
private boolean isIntegratedAddress() {
String address = etAddress.getEditText().getText().toString();
return Wallet.isAddressValid(address, WalletManager.getInstance().isTestNet())
&& address.length() == 106;
}
private boolean checkPaymentId() {
String paymentId = etPaymentId.getEditText().getText().toString();
boolean ok = paymentId.isEmpty() || Wallet.isPaymentIdValid(paymentId);
if (!ok) {
etPaymentId.setError(getString(R.string.receive_paymentid_invalid));
} else {
etPaymentId.setError(null);
if (!paymentId.isEmpty() && isIntegratedAddress()) {
ok = false;
etPaymentId.setError(getString(R.string.receive_integrated_paymentid_invalid));
} else {
etPaymentId.setError(null);
}
}
return ok;
}
@@ -46,7 +46,7 @@ public class SendAmountWizardFragment extends SendWizardFragment {
}
interface Listener {
SendFragmentNew.Listener getActivityCallback();
SendFragment.Listener getActivityCallback();
void setAmount(final long amount);
@@ -53,7 +53,7 @@ public class SendConfirmWizardFragment extends SendWizardFragment {
}
interface Listener {
SendFragmentNew.Listener getActivityCallback();
SendFragment.Listener getActivityCallback();
TxData getTxData();
@@ -70,7 +70,7 @@ public class SendConfirmWizardFragment extends SendWizardFragment {
private TextView tvTxAmount;
private TextView tvTxFee;
private TextView tvTxTotal;
private View pbProgress;
private View llProgress;
private View bSend;
private View llConfirmSend;
private View pbProgressSend;
@@ -91,7 +91,7 @@ public class SendConfirmWizardFragment extends SendWizardFragment {
tvTxFee = (TextView) view.findViewById(R.id.tvTxFee);
tvTxTotal = (TextView) view.findViewById(R.id.tvTxTotal);
pbProgress = view.findViewById(R.id.pbProgress);
llProgress = view.findViewById(R.id.llProgress);
pbProgressSend = view.findViewById(R.id.pbProgressSend);
llConfirmSend = view.findViewById(R.id.llConfirmSend);
@@ -111,12 +111,12 @@ public class SendConfirmWizardFragment extends SendWizardFragment {
boolean inProgress = false;
public void hideProgress() {
pbProgress.setVisibility(View.INVISIBLE);
llProgress.setVisibility(View.INVISIBLE);
inProgress = false;
}
public void showProgress() {
pbProgress.setVisibility(View.VISIBLE);
llProgress.setVisibility(View.VISIBLE);
inProgress = true;
}
@@ -300,7 +300,7 @@ public class SendConfirmWizardFragment extends SendWizardFragment {
getActivityCallback().onPrepareSend(txData);
}
SendFragmentNew.Listener getActivityCallback() {
SendFragment.Listener getActivityCallback() {
return sendListener.getActivityCallback();
}
}
@@ -49,7 +49,7 @@ import java.lang.ref.WeakReference;
import timber.log.Timber;
public class SendFragmentNew extends Fragment
public class SendFragment extends Fragment
implements SendAddressWizardFragment.Listener,
SendAmountWizardFragment.Listener,
SendSettingsWizardFragment.Listener,
@@ -281,15 +281,15 @@ public class SendFragmentNew extends Fragment
Timber.d("getItem(%d) CREATE", position);
switch (position) {
case POS_ADDRESS:
return SendAddressWizardFragment.newInstance(SendFragmentNew.this);
return SendAddressWizardFragment.newInstance(SendFragment.this);
case POS_AMOUNT:
return SendAmountWizardFragment.newInstance(SendFragmentNew.this);
return SendAmountWizardFragment.newInstance(SendFragment.this);
case POS_SETTINGS:
return SendSettingsWizardFragment.newInstance(SendFragmentNew.this);
return SendSettingsWizardFragment.newInstance(SendFragment.this);
case POS_CONFIRM:
return SendConfirmWizardFragment.newInstance(SendFragmentNew.this);
return SendConfirmWizardFragment.newInstance(SendFragment.this);
case POS_SUCCESS:
return SendSuccessWizardFragment.newInstance(SendFragmentNew.this);
return SendSuccessWizardFragment.newInstance(SendFragment.this);
default:
throw new IllegalArgumentException("no such send position(" + position + ")");
}
@@ -448,8 +448,8 @@ public class SendFragmentNew extends Fragment
confirmFragment.hideProgress();
AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
builder.setCancelable(false).
setTitle(getString(R.string.send_error_title)).
builder.setCancelable(true).
setTitle(getString(R.string.send_create_tx_error_title)).
setMessage(errorText).
create().
show();
@@ -483,4 +483,16 @@ public class SendFragmentNew extends Fragment
fragment.sendFailed();
}
}
@Override
public void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setHasOptionsMenu(true);
}
@Override
public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
inflater.inflate(R.menu.send_menu, menu);
super.onCreateOptionsMenu(menu, inflater);
}
}
@@ -53,7 +53,7 @@ import java.util.Map;
import timber.log.Timber;
public class WalletActivity extends SecureActivity implements WalletFragment.Listener,
WalletService.Observer, SendFragmentNew.Listener, TxFragment.Listener,
WalletService.Observer, SendFragment.Listener, TxFragment.Listener,
GenerateReviewFragment.ListenerWithWallet,
GenerateReviewFragment.Listener,
ScannerFragment.OnScannedListener, ReceiveFragment.Listener,
@@ -360,7 +360,7 @@ public class WalletActivity extends SecureActivity implements WalletFragment.Lis
@Override
public void onSendRequest() {
replaceFragment(new SendFragmentNew(), null, null);
replaceFragment(new SendFragment(), null, null);
}
@Override
@@ -463,7 +463,7 @@ public class WalletActivity extends SecureActivity implements WalletFragment.Lis
@Override
public void onTransactionCreated(final PendingTransaction pendingTransaction) {
try {
final SendFragmentNew sendFragment = (SendFragmentNew)
final SendFragment sendFragment = (SendFragment)
getSupportFragmentManager().findFragmentById(R.id.fragment_container);
runOnUiThread(new Runnable() {
public void run() {
@@ -488,7 +488,7 @@ public class WalletActivity extends SecureActivity implements WalletFragment.Lis
@Override
public void onSendTransactionFailed(final String error) {
try {
final SendFragmentNew sendFragment = (SendFragmentNew)
final SendFragment sendFragment = (SendFragment)
getSupportFragmentManager().findFragmentById(R.id.fragment_container);
runOnUiThread(new Runnable() {
public void run() {
@@ -504,7 +504,7 @@ public class WalletActivity extends SecureActivity implements WalletFragment.Lis
@Override
public void onTransactionSent(final String txId) {
try {
final SendFragmentNew sendFragment = (SendFragmentNew)
final SendFragment sendFragment = (SendFragment)
getSupportFragmentManager().findFragmentById(R.id.fragment_container);
runOnUiThread(new Runnable() {
public void run() {
@@ -21,9 +21,7 @@ import android.support.v4.view.ViewPager;
import android.util.AttributeSet;
import android.view.MotionEvent;
import com.m2049r.xmrwallet.SendFragmentNew;
import timber.log.Timber;
import com.m2049r.xmrwallet.SendFragment;
public class SpendViewPager extends ViewPager {
@@ -57,7 +55,7 @@ public class SpendViewPager extends ViewPager {
}
public boolean validateFields(int position) {
OnValidateFieldsListener c = ((SendFragmentNew.SpendPagerAdapter) getAdapter()).getFragment(position);
OnValidateFieldsListener c = ((SendFragment.SpendPagerAdapter) getAdapter()).getFragment(position);
return c.onValidateFields();
}