From d8759710086aa32a22d16077a0504bebef5e7553 Mon Sep 17 00:00:00 2001 From: Tangem Date: Fri, 6 Jul 2018 12:17:43 +0300 Subject: [PATCH] Updated on 2026-08-14 --- .../presentation/fragment/LoadedWallet.java | 36 ++++--------- .../tangem/presentation/fragment/Main.java | 22 ++++---- app/src/main/res/layout/fr_loaded_wallet.xml | 53 +++++++++++++++---- app/src/main/res/layout/fr_main.xml | 24 +++++++++ app/src/main/res/values/dimens.xml | 1 + app/src/main/res/values/strings.xml | 2 + 6 files changed, 93 insertions(+), 45 deletions(-) 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 ab4592b573..25c6e16735 100644 --- a/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.java +++ b/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.java @@ -28,6 +28,7 @@ import android.view.View; import android.view.ViewGroup; import android.widget.ImageView; import android.widget.ProgressBar; +import android.widget.RelativeLayout; import android.widget.TextView; import android.widget.Toast; @@ -112,12 +113,15 @@ public class LoadedWallet extends Fragment implements SwipeRefreshLayout.OnRefre private ImageView ivPIN; private ImageView ivPIN2orSecurityDelay; private ImageView ivDeveloperVersion; + private RelativeLayout rlProgressBar; private SwipeRefreshLayout mSwipeRefreshLayout; private List updateTasks = new ArrayList<>(); private NfcManager mNfcManager; private boolean lastReadSuccess = true; private VerifyCardTask verifyCardTask = null; private int requestPIN2Count = 0; + private CardProtocol mCardProtocol; + private int scanTimes = 0; private Timer timerHideErrorAndMessage = null; private String newPIN = "", newPIN2 = ""; @@ -317,7 +321,7 @@ public class LoadedWallet extends Fragment implements SwipeRefreshLayout.OnRefre @Override protected void onPostExecute(List requests) { super.onPostExecute(requests); - Log.i("RequestWalletInfoTask", "onPostExecute[" + String.valueOf(updateTasks.size()) + "]"); +// Log.i("RequestWalletInfoTask", "onPostExecute[" + String.valueOf(updateTasks.size()) + "]"); updateTasks.remove(this); CoinEngine engine = CoinEngineFactory.Create(mCard.getBlockchain()); @@ -577,13 +581,14 @@ public class LoadedWallet extends Fragment implements SwipeRefreshLayout.OnRefre View v = inflater.inflate(R.layout.fr_loaded_wallet, container, false); mSwipeRefreshLayout = v.findViewById(R.id.swipe_container); + rlProgressBar = v.findViewById(R.id.rlProgressBar); + progressBar = v.findViewById(R.id.progressBar); ivTangemCard = v.findViewById(R.id.ivTangemCard); tvBalance = v.findViewById(R.id.tvBalance); tvOffline = v.findViewById(R.id.tvOffline); tvCardID = v.findViewById(R.id.tvCardID); tvWallet = v.findViewById(R.id.tvWallet); tvInputs = v.findViewById(R.id.tvInputs); -// TextView lbInputs = v.findViewById(R.id.lbInputs); tvLastOutput = v.findViewById(R.id.tvLastOutput); tvError = v.findViewById(R.id.tvError); tvMessage = v.findViewById(R.id.tvMessage); @@ -594,7 +599,6 @@ public class LoadedWallet extends Fragment implements SwipeRefreshLayout.OnRefre ImageView imgLookup = v.findViewById(R.id.imgLookup); ImageView ivCopy = v.findViewById(R.id.ivCopy); tvValidationNode = v.findViewById(R.id.tvValidationNode); - progressBar = v.findViewById(R.id.progressBar); tvBlockchain = v.findViewById(R.id.tvBlockchain); ivBlockchain = v.findViewById(R.id.imgBlockchain); ivPIN = v.findViewById(R.id.imgPIN); @@ -614,17 +618,11 @@ public class LoadedWallet extends Fragment implements SwipeRefreshLayout.OnRefre ivTangemCard.setImageResource(mCard.getCardImageResource()); -// Log.i(TAG, "sxnnnnnnnnnnn " + mCard.getBlockchainID()); - Log.i(TAG, "sxnnnnnnnnnnn " + mCard.getTokenSymbol()); -// Log.i(TAG, "getDenomination " + Arrays.toString(mCard.getDenomination())); - final CoinEngine engine = CoinEngineFactory.Create(mCard.getBlockchain()); boolean visibleFlag = engine != null ? engine.InOutPutVisible() : true; int visibleIOPuts = visibleFlag ? View.VISIBLE : View.GONE; tvInputs.setVisibility(visibleIOPuts); -// lbInputs.setVisibility(visibleIOPuts); -// tvLastOutput.setVisibility(visibleIOPuts); try { ivQR.setImageBitmap(UtilHelper.INSTANCE.generateQrCode(Objects.requireNonNull(engine).getShareWalletURI(mCard).toString())); @@ -1059,16 +1057,12 @@ public class LoadedWallet extends Fragment implements SwipeRefreshLayout.OnRefre @Override public void OnReadStart(CardProtocol cardProtocol) { progressBar.post(() -> { + rlProgressBar.setVisibility(View.VISIBLE); progressBar.setVisibility(View.VISIBLE); progressBar.setProgress(5); }); } - private CardProtocol mCardProtocol; - - // private boolean needOpenVerify; - private int scanTimes = 0; - @Override public void OnReadFinish(final CardProtocol cardProtocol) { verifyCardTask = null; @@ -1076,6 +1070,7 @@ public class LoadedWallet extends Fragment implements SwipeRefreshLayout.OnRefre if (cardProtocol != null) { if (cardProtocol.getError() == null) { progressBar.post(() -> { + rlProgressBar.setVisibility(View.GONE); progressBar.setProgress(100); progressBar.setProgressTintList(ColorStateList.valueOf(Color.GREEN)); @@ -1109,6 +1104,7 @@ public class LoadedWallet extends Fragment implements SwipeRefreshLayout.OnRefre progressBar.postDelayed(() -> { try { + rlProgressBar.setVisibility(View.GONE); progressBar.setProgress(0); progressBar.setProgressTintList(ColorStateList.valueOf(Color.DKGRAY)); progressBar.setVisibility(View.INVISIBLE); @@ -1128,6 +1124,7 @@ public class LoadedWallet extends Fragment implements SwipeRefreshLayout.OnRefre verifyCardTask = null; progressBar.postDelayed(() -> { try { + rlProgressBar.setVisibility(View.GONE); progressBar.setProgress(0); progressBar.setProgressTintList(ColorStateList.valueOf(Color.DKGRAY)); progressBar.setVisibility(View.INVISIBLE); @@ -1222,12 +1219,7 @@ public class LoadedWallet extends Fragment implements SwipeRefreshLayout.OnRefre else tvInputs.setTextColor(ContextCompat.getColor(Objects.requireNonNull(getContext()), R.color.confirmed)); -// if (btnSend != null) { -// btnSend.setText(mCard.getOutputsDescription()); -// } - tvLastInput.setText(mCard.getLastInputDescription()); -// tvLastOutput.setText(mCard.getLastOutputDescription()); tvBlockchain.setText(mCard.getBlockchainName()); ivBlockchain.setImageResource(mCard.getBlockchain().getImageResource(this.getContext(), mCard.getTokenSymbol())); @@ -1270,12 +1262,6 @@ public class LoadedWallet extends Fragment implements SwipeRefreshLayout.OnRefre else btnExtract.setEnabled(false); -// if (tvPurge != null) -// if (mCard.hasBalanceInfo()) -// tvPurge.setEnabled(true); -// else -// tvPurge.setEnabled(false); - tvIssuer.setText(mCard.getIssuerDescription()); timerHideErrorAndMessage = new Timer(); diff --git a/app/src/main/java/com/tangem/presentation/fragment/Main.java b/app/src/main/java/com/tangem/presentation/fragment/Main.java index ed5f6b113f..cdcac5adc2 100644 --- a/app/src/main/java/com/tangem/presentation/fragment/Main.java +++ b/app/src/main/java/com/tangem/presentation/fragment/Main.java @@ -22,6 +22,7 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.ProgressBar; +import android.widget.RelativeLayout; import android.widget.Toast; import com.tangem.data.network.request.ElectrumRequest; @@ -70,6 +71,7 @@ public class Main extends Fragment implements NfcAdapter.ReaderCallback, CardLis private NfcManager mNfcManager; private ArrayList slCardUIDs = new ArrayList<>(); + private RelativeLayout rlProgressBar; private ProgressBar progressBar; private CardListAdapter mCardListAdapter; private ReadCardInfoTask readCardInfoTask; @@ -382,24 +384,18 @@ public class Main extends Fragment implements NfcAdapter.ReaderCallback, CardLis return mCardListAdapter; } -// @Override -// public void onSaveInstanceState(Bundle outState) { -// super.onSaveInstanceState(outState); -// mCardListAdapter.onSaveInstanceState(outState); -// outState.putStringArrayList("slCardUIDs", slCardUIDs); -// } - @Override public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - View result = inflater.inflate(R.layout.fr_main, container, false); + View v = inflater.inflate(R.layout.fr_main, container, false); mNfcManager = new NfcManager(getActivity(), this); verifyPermissions(); - progressBar = result.findViewById(R.id.progressBar); + rlProgressBar = v.findViewById(R.id.rlProgressBar); + progressBar = v.findViewById(R.id.progressBar); progressBar.setProgressTintList(ColorStateList.valueOf(Color.DKGRAY)); - RecyclerView rvCards = result.findViewById(R.id.lvCards); + RecyclerView rvCards = v.findViewById(R.id.lvCards); rvCards.setVisibility(View.GONE); rvCards.setLayoutManager(new LinearLayoutManager(getContext())); @@ -439,7 +435,7 @@ public class Main extends Fragment implements NfcAdapter.ReaderCallback, CardLis ((MainActivity) getActivity()).setNfcAdapterReaderCallback(this); } - return result; + return v; } @Override @@ -577,6 +573,7 @@ public class Main extends Fragment implements NfcAdapter.ReaderCallback, CardLis @Override public void OnReadStart(CardProtocol cardProtocol) { progressBar.post(() -> { + rlProgressBar.setVisibility(View.VISIBLE); progressBar.setVisibility(View.VISIBLE); progressBar.setProgress(5); }); @@ -593,6 +590,7 @@ public class Main extends Fragment implements NfcAdapter.ReaderCallback, CardLis if (cardProtocol != null) { if (cardProtocol.getError() == null) { progressBar.post(() -> { + rlProgressBar.setVisibility(View.GONE); progressBar.setProgress(100); progressBar.setProgressTintList(ColorStateList.valueOf(Color.GREEN)); @@ -665,6 +663,7 @@ public class Main extends Fragment implements NfcAdapter.ReaderCallback, CardLis progressBar.postDelayed(() -> { try { + rlProgressBar.setVisibility(View.GONE); progressBar.setProgress(0); progressBar.setProgressTintList(ColorStateList.valueOf(Color.DKGRAY)); progressBar.setVisibility(View.INVISIBLE); @@ -679,6 +678,7 @@ public class Main extends Fragment implements NfcAdapter.ReaderCallback, CardLis readCardInfoTask = null; progressBar.postDelayed(() -> { try { + rlProgressBar.setVisibility(View.GONE); progressBar.setProgress(0); progressBar.setProgressTintList(ColorStateList.valueOf(Color.DKGRAY)); progressBar.setVisibility(View.INVISIBLE); diff --git a/app/src/main/res/layout/fr_loaded_wallet.xml b/app/src/main/res/layout/fr_loaded_wallet.xml index 793bf15246..f2bd7107f0 100644 --- a/app/src/main/res/layout/fr_loaded_wallet.xml +++ b/app/src/main/res/layout/fr_loaded_wallet.xml @@ -12,6 +12,39 @@ tools:ignore="contentDescription" tools:showIn="@layout/activity_loaded_wallet"> + + + + + + + + + /> - - - - - - - + + + + + + + + android:visibility="invisible" + tools:layout_editor_absoluteY="495dp"/> \ No newline at end of file diff --git a/app/src/main/res/layout/fr_main.xml b/app/src/main/res/layout/fr_main.xml index c9d3a8322d..7cb2a8f24e 100644 --- a/app/src/main/res/layout/fr_main.xml +++ b/app/src/main/res/layout/fr_main.xml @@ -7,6 +7,30 @@ tools:context="com.tangem.presentation.fragment.Main" tools:showIn="@layout/content_main"> + + + + + + + + 220dp 30dp + 135dp diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 4cbca26b7a..d17a801df9 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -46,6 +46,8 @@ Smart Cash AG Wallet Need attach card again + READING… + VERIFYING… Your Android device is rooted. Security at risk!