From 5113d0b2303cc46ab7ff46ad9b2dab205324f121 Mon Sep 17 00:00:00 2001 From: Tangem Date: Thu, 14 Jun 2018 20:38:59 +0300 Subject: [PATCH] Updated on 2026-08-14 --- .idea/caches/build_file_checksums.ser | Bin 536 -> 536 bytes .../presentation/fragment/LoadedWallet.java | 77 +++++++++--------- app/src/main/res/drawable/rounded_shape.xml | 13 +++ app/src/main/res/layout/fr_loaded_wallet.xml | 12 +-- app/src/main/res/values/styles.xml | 4 + 5 files changed, 62 insertions(+), 44 deletions(-) create mode 100644 app/src/main/res/drawable/rounded_shape.xml diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index 5e6e0bf7b04ac3c0f6e5f7b5ed703f8ddbad37f2..7d905445491c6f0f0f5f3b860cf47092d78f5e2b 100644 GIT binary patch delta 15 XcmbQiGJ|Ep43__%`Vt%G)Gz`7E_DUI delta 15 XcmbQiGJ|Ep43=NzOiCN))Gz`7F0%#1 diff --git a/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.java b/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.java index 7510508c17..1c9c790240 100644 --- a/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.java +++ b/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.java @@ -21,6 +21,7 @@ import android.support.annotation.NonNull; import android.support.v4.app.Fragment; import android.support.v4.content.ContextCompat; import android.support.v4.widget.SwipeRefreshLayout; +import android.support.v7.widget.AppCompatButton; import android.text.Html; import android.text.Spanned; import android.util.Log; @@ -97,7 +98,7 @@ public class LoadedWallet extends Fragment implements SwipeRefreshLayout.OnRefre private static final int REQUEST_CODE_SWAP_PIN = 8; private TangemCard mCard; - private TextView tvCardID, tvBalance, tvOffline, tvBalanceEquivalent, tvWallet, tvInputs, lbInputs, tvOutputs, tvLoad, tvSend, tvPurge, tvError, tvMessage, tvIssuer, tvIssuerData, tvBlockchain, tvLastInput, tvLastOutput, lbLastOutput, tvValidationNode; + private TextView tvCardID, tvBalance, tvOffline, tvBalanceEquivalent, tvWallet, tvInputs, lbInputs, tvPurge, tvError, tvMessage, tvIssuer, tvIssuerData, tvBlockchain, tvLastInput, tvLastOutput, lbLastOutput, tvValidationNode; private TextView tvHeader, tvCaution; private ImageView imgLookup; private TextView tvLookup; @@ -113,6 +114,7 @@ public class LoadedWallet extends Fragment implements SwipeRefreshLayout.OnRefre private Timer timerHideErrorAndMessage = null; private String newPIN = "", newPIN2 = ""; + private AppCompatButton btnLoad, btnExtract; public LoadedWallet() { @@ -595,8 +597,6 @@ public class LoadedWallet extends Fragment implements SwipeRefreshLayout.OnRefre tvIssuerData = v.findViewById(R.id.tvIssuerData); tvHeader = v.findViewById(R.id.tvHeader); tvCaution = v.findViewById(R.id.tvCaution); - tvLoad = v.findViewById(R.id.tvLoad); - tvSend = v.findViewById(R.id.tvSend); imgLookup = v.findViewById(R.id.imgLookup); tvValidationNode = v.findViewById(R.id.tvValidationNode); progressBar = v.findViewById(R.id.progressBar); @@ -608,6 +608,8 @@ public class LoadedWallet extends Fragment implements SwipeRefreshLayout.OnRefre ivQR = v.findViewById(R.id.qrWallet); tvLookup = v.findViewById(R.id.tvLookup); tvPurge = v.findViewById(R.id.tvPurge); + btnLoad = v.findViewById(R.id.btnLoad); + btnExtract = v.findViewById(R.id.btnExtract); mSwipeRefreshLayout.setOnRefreshListener(this); @@ -672,33 +674,32 @@ public class LoadedWallet extends Fragment implements SwipeRefreshLayout.OnRefre }); } - if (tvSend != null) { - tvSend.setOnClickListener(v13 -> { - if (!mCard.hasBalanceInfo()) { - return; - } else if (!Objects.requireNonNull(engine).IsBalanceNotZero(mCard)) { - Toast.makeText(getContext(), R.string.wallet_empty, Toast.LENGTH_LONG).show(); - return; - } else if (!engine.IsBalanceAlterNotZero(mCard)) { - Toast.makeText(getContext(), R.string.not_enough_funds, Toast.LENGTH_LONG).show(); - return; - } else if (engine.AwaitingConfirmation(mCard)) { - Toast.makeText(getContext(), R.string.please_wait_while_previous, Toast.LENGTH_LONG).show(); - return; - } else if (!engine.CheckUnspentTransaction(mCard)) { - Toast.makeText(getContext(), R.string.please_wait_for_confirmation, Toast.LENGTH_LONG).show(); - return; - } else if (mCard.getRemainingSignatures() == 0) { - Toast.makeText(getContext(), R.string.card_hasn_t_remaining_signature, Toast.LENGTH_LONG).show(); - return; - } - Intent intent = new Intent(getContext(), PreparePaymentActivity.class); - intent.putExtra("UID", mCard.getUID()); - intent.putExtra("Card", mCard.getAsBundle()); - startActivityForResult(intent, REQUEST_CODE_SEND_PAYMENT); - }); - } + btnExtract.setOnClickListener(v13 -> { + if (!mCard.hasBalanceInfo()) { + return; + } else if (!Objects.requireNonNull(engine).IsBalanceNotZero(mCard)) { + Toast.makeText(getContext(), R.string.wallet_empty, Toast.LENGTH_LONG).show(); + return; + } else if (!engine.IsBalanceAlterNotZero(mCard)) { + Toast.makeText(getContext(), R.string.not_enough_funds, Toast.LENGTH_LONG).show(); + return; + } else if (engine.AwaitingConfirmation(mCard)) { + Toast.makeText(getContext(), R.string.please_wait_while_previous, Toast.LENGTH_LONG).show(); + return; + } else if (!engine.CheckUnspentTransaction(mCard)) { + Toast.makeText(getContext(), R.string.please_wait_for_confirmation, Toast.LENGTH_LONG).show(); + return; + } else if (mCard.getRemainingSignatures() == 0) { + Toast.makeText(getContext(), R.string.card_hasn_t_remaining_signature, Toast.LENGTH_LONG).show(); + return; + } + + Intent intent = new Intent(getContext(), PreparePaymentActivity.class); + intent.putExtra("UID", mCard.getUID()); + intent.putExtra("Card", mCard.getAsBundle()); + startActivityForResult(intent, REQUEST_CODE_SEND_PAYMENT); + }); updateViews(); @@ -709,7 +710,7 @@ public class LoadedWallet extends Fragment implements SwipeRefreshLayout.OnRefre tvWallet.setOnClickListener(v12 -> doShareWallet(false)); ivQR.setOnClickListener(v1 -> doShareWallet(true)); - tvLoad.setOnClickListener(v1 -> { + btnLoad.setOnClickListener(v1 -> { Intent intent = new Intent(Intent.ACTION_VIEW, Objects.requireNonNull(CoinEngineFactory.Create(mCard.getBlockchain())).getShareWalletURI(mCard)); intent.addCategory(Intent.CATEGORY_DEFAULT); startActivity(intent); @@ -1326,9 +1327,9 @@ public class LoadedWallet extends Fragment implements SwipeRefreshLayout.OnRefre else tvInputs.setTextColor(ContextCompat.getColor(Objects.requireNonNull(getContext()), R.color.confirmed)); - if (tvOutputs != null) { - tvOutputs.setText(mCard.getOutputsDescription()); - } +// if (btnSend != null) { +// btnSend.setText(mCard.getOutputsDescription()); +// } if (tvLastInput != null) { tvLastInput.setText(mCard.getLastInputDescription()); @@ -1372,11 +1373,11 @@ public class LoadedWallet extends Fragment implements SwipeRefreshLayout.OnRefre ivDeveloperVersion.setVisibility(View.INVISIBLE); } - if (tvSend != null) - if (mCard.hasBalanceInfo()) - tvSend.setEnabled(true); - else - tvSend.setEnabled(false); + + if (mCard.hasBalanceInfo()) + btnExtract.setEnabled(true); + else + btnExtract.setEnabled(false); // if (tvPurge != null) // if (mCard.hasBalanceInfo()) diff --git a/app/src/main/res/drawable/rounded_shape.xml b/app/src/main/res/drawable/rounded_shape.xml new file mode 100644 index 0000000000..c1d49517de --- /dev/null +++ b/app/src/main/res/drawable/rounded_shape.xml @@ -0,0 +1,13 @@ + + + + + + + + + diff --git a/app/src/main/res/layout/fr_loaded_wallet.xml b/app/src/main/res/layout/fr_loaded_wallet.xml index 2c91287e6f..2b3d06341d 100644 --- a/app/src/main/res/layout/fr_loaded_wallet.xml +++ b/app/src/main/res/layout/fr_loaded_wallet.xml @@ -447,13 +447,13 @@ app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent"> - - @color/black_overlay + +