From cbab8927bf369db5b66af21143ba1351d5412d06 Mon Sep 17 00:00:00 2001 From: Tangem Date: Wed, 20 Jun 2018 13:01:47 +0300 Subject: [PATCH] Updated on 2026-08-14 --- .../presentation/fragment/LoadedWallet.java | 10 +- .../drawable/ic_content_copy_black_24dp.xml | 8 ++ app/src/main/res/layout/fr_loaded_wallet.xml | 110 ++++++------------ app/src/main/res/values/dimens.xml | 3 + 4 files changed, 52 insertions(+), 79 deletions(-) create mode 100755 app/src/main/res/drawable/ic_content_copy_black_24dp.xml 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 22251a8628..42dd7da4e8 100644 --- a/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.java +++ b/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.java @@ -614,6 +614,7 @@ public class LoadedWallet extends Fragment implements SwipeRefreshLayout.OnRefre tvHeader = v.findViewById(R.id.tvHeader); tvCaution = v.findViewById(R.id.tvCaution); 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); @@ -622,7 +623,7 @@ public class LoadedWallet extends Fragment implements SwipeRefreshLayout.OnRefre ivPIN2orSecurityDelay = v.findViewById(R.id.imgPIN2orSecurityDelay); ivDeveloperVersion = v.findViewById(R.id.imgDeveloperVersion); ImageView ivQR = v.findViewById(R.id.qrWallet); - TextView tvLookup = v.findViewById(R.id.tvLookup); + fabPurge = v.findViewById(R.id.fabPurge); fabNFC = v.findViewById(R.id.fabNFC); AppCompatButton btnLoad = v.findViewById(R.id.btnLoad); @@ -666,12 +667,7 @@ public class LoadedWallet extends Fragment implements SwipeRefreshLayout.OnRefre startActivity(browserIntent); }); - tvLookup.setOnClickListener(v14 -> { - if (!mCard.hasBalanceInfo()) return; - CoinEngine engineClick = CoinEngineFactory.Create(mCard.getBlockchain()); - Intent browserIntent = new Intent(Intent.ACTION_VIEW, Objects.requireNonNull(engineClick).getShareWalletURIExplorer(mCard)); - startActivity(browserIntent); - }); + ivCopy.setOnClickListener(v14 -> doShareWallet(false)); tvWallet.setOnClickListener(v12 -> doShareWallet(false)); diff --git a/app/src/main/res/drawable/ic_content_copy_black_24dp.xml b/app/src/main/res/drawable/ic_content_copy_black_24dp.xml new file mode 100755 index 0000000000..5d3c83e62c --- /dev/null +++ b/app/src/main/res/drawable/ic_content_copy_black_24dp.xml @@ -0,0 +1,8 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fr_loaded_wallet.xml b/app/src/main/res/layout/fr_loaded_wallet.xml index 7543d4b7a3..4572ca2d9e 100644 --- a/app/src/main/res/layout/fr_loaded_wallet.xml +++ b/app/src/main/res/layout/fr_loaded_wallet.xml @@ -179,99 +179,65 @@ tools:text="Bitcoin"/> - - - - - - - - - - - - - - + android:layout_width="@dimen/size_qr_image" + android:layout_height="@dimen/size_qr_image"/> + + - + - - - - - - + android:paddingRight="8dp" + android:visibility="gone"> + android:paddingRight="8dp" + android:visibility="gone"> + android:paddingRight="8dp" + android:visibility="gone"> + android:paddingRight="8dp" + android:visibility="gone"> + android:paddingRight="8dp" + android:visibility="gone"> 24sp 32sp + 220dp + 30dp +