From b0646dcec093949737a3d5d7e5bc06bf16401d9b Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Tue, 24 Jul 2018 20:38:25 +0300
Subject: [PATCH] Updated on 2026-08-14

---
 .../presentation/adapter/CardListAdapter.java |   2 +-
 .../presentation/fragment/LoadedWallet.kt     |  32 +-
 app/src/main/res/layout/fr_loaded_wallet.xml  | 304 +-----------------
 3 files changed, 10 insertions(+), 328 deletions(-)

diff --git a/app/src/main/java/com/tangem/presentation/adapter/CardListAdapter.java b/app/src/main/java/com/tangem/presentation/adapter/CardListAdapter.java
index 69f2d4d63d..f90687b268 100644
--- a/app/src/main/java/com/tangem/presentation/adapter/CardListAdapter.java
+++ b/app/src/main/java/com/tangem/presentation/adapter/CardListAdapter.java
@@ -56,7 +56,7 @@ public class CardListAdapter extends RecyclerView.Adapter<CardListAdapter.CardVi
             tvType = itemView.findViewById(R.id.tvType);
             tvTypeBg = itemView.findViewById(R.id.tvTypeBg);
             tvVoid = itemView.findViewById(R.id.tvVoid);
-            tvInputs = itemView.findViewById(R.id.tvInputs);
+//            tvInputs = itemView.findViewById(R.id.tvInputs);
             tvLastInput = itemView.findViewById(R.id.tvLastInput);
             lbLastInput = itemView.findViewById(R.id.lbLastInput);
             lbLastOutput = itemView.findViewById(R.id.lbLastOutput);
diff --git a/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.kt b/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.kt
index 5c04f5f681..057e7d4964 100644
--- a/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.kt
+++ b/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.kt
@@ -137,7 +137,7 @@ class LoadedWallet : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific
         val visibleFlag = engine?.InOutPutVisible() ?: true
         val visibleIOPuts = if (visibleFlag) View.VISIBLE else View.GONE
 
-        tvInputs.visibility = visibleIOPuts
+//        tvInputs.visibility = visibleIOPuts
 
         try {
             ivQR.setImageBitmap(UtilHelper.generateQrCode(engine!!.getShareWalletURI(mCard).toString()))
@@ -497,14 +497,6 @@ class LoadedWallet : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific
 
         if (needResendTX)
             sendTransaction(LastSignStorage.getTxForSend(mCard!!.wallet))
-
-
-//        if (activity!!.intent.extras!!.containsKey(NfcAdapter.EXTRA_TAG)) {
-//            val tag = activity!!.intent.getParcelableExtra<Tag>(NfcAdapter.EXTRA_TAG)
-//            if (tag != null) {
-//                onTagDiscovered(tag)
-//            }
-//        }
     }
 
     override fun onTagDiscovered(tag: Tag) {
@@ -630,8 +622,6 @@ class LoadedWallet : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific
                     tvBalance.text = engine.GetBalanceWithAlter(mCard)
                 }
 
-                tvBalanceEquivalent.text = engine.GetBalanceEquivalent(mCard)
-                tvOffline.visibility = View.INVISIBLE
             } else {
                 val offlineAmount = engine.ConvertByteArrayToAmount(mCard, mCard!!.offlineBalance)
                 if (mCard!!.blockchain == Blockchain.Token) {
@@ -639,34 +629,14 @@ class LoadedWallet : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific
                 } else {
                     tvBalance.text = engine.GetAmountDescription(mCard, offlineAmount)
                 }
-
-                tvBalanceEquivalent.text = engine.GetAmountEqualentDescriptor(mCard, offlineAmount)
-                tvOffline.visibility = View.VISIBLE
-            }
-
-            if (!mCard!!.amountEquivalentDescriptionAvailable) {
-
-            } else {
-                tvBalanceEquivalent.error = null
             }
 
             tvWallet.text = mCard!!.wallet
 
-            tvInputs.text = mCard!!.inputsDescription
-            when {
-                mCard!!.lastInputDescription.contains("awaiting") -> tvInputs.setTextColor(ContextCompat.getColor(context!!, R.color.not_confirmed))
-                mCard!!.lastInputDescription.contains("None") -> tvInputs.setTextColor(ContextCompat.getColor(context!!, R.color.primary_dark))
-                else -> tvInputs.setTextColor(ContextCompat.getColor(context!!, R.color.confirmed))
-            }
-
             tvBlockchain.text = mCard!!.blockchainName
 
-            tvValidationNode.text = mCard!!.validationNodeDescription
-
             btnExtract!!.isEnabled = mCard!!.hasBalanceInfo()
 
-            tvIssuer.text = mCard!!.issuerDescription
-
             mCard!!.error = null
             mCard!!.message = null
 
diff --git a/app/src/main/res/layout/fr_loaded_wallet.xml b/app/src/main/res/layout/fr_loaded_wallet.xml
index e05c029c52..c90a272d08 100644
--- a/app/src/main/res/layout/fr_loaded_wallet.xml
+++ b/app/src/main/res/layout/fr_loaded_wallet.xml
@@ -24,7 +24,6 @@
         app:layout_constraintTop_toTopOf="parent">
 
         <RelativeLayout
-            android:id="@+id/rlCardInfo"
             android:layout_width="match_parent"
             android:layout_height="match_parent">
 
@@ -36,20 +35,6 @@
                 android:gravity="center"
                 android:orientation="vertical">
 
-                <!--not used-->
-                <TextView
-                    android:id="@+id/tvCaution"
-                    android:layout_width="match_parent"
-                    android:layout_height="20dp"
-                    android:background="@color/msg_err"
-                    android:fontFamily="@font/raleway_r"
-                    android:gravity="center_vertical"
-                    android:text="@string/do_not_accept"
-                    android:textAlignment="center"
-                    android:textColor="@color/white"
-                    android:textSize="@dimen/text_size_1_small"
-                    android:visibility="gone"/>
-
                 <RelativeLayout
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
@@ -96,6 +81,7 @@
                             android:progressTint="@color/colorPrimary"/>
 
                     </RelativeLayout>
+
                 </RelativeLayout>
 
                 <LinearLayout
@@ -116,6 +102,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:fontFamily="@font/montserrat_light"
+                            android:paddingLeft="10dp"
                             android:paddingRight="10dp"
                             android:text="@string/no_data_string"
                             android:textAlignment="center"
@@ -144,8 +131,9 @@
                         android:layout_marginTop="5dp"
                         android:fontFamily="@font/montserrat_light"
                         android:textAlignment="center"
-                        android:textColor="@android:color/holo_orange_dark"
-                        android:textSize="18sp"/>
+                        android:textColor="@color/msg_err"
+                        android:textSize="18sp"
+                        tools:text="Verification field"/>
 
                     <TextView
                         android:id="@+id/tvBalanceLine2"
@@ -153,109 +141,8 @@
                         android:layout_height="wrap_content"
                         android:layout_marginTop="5dp"
                         android:fontFamily="@font/montserrat_light"
-                        android:textAlignment="center"/>
-
-                </LinearLayout>
-
-                <!--not used-->
-                <TextView
-                    android:id="@+id/tvHeader"
-                    android:layout_width="match_parent"
-                    android:layout_height="35dp"
-                    android:fontFamily="@font/raleway_r"
-                    android:paddingTop="8dp"
-                    android:text="@string/banknote"
-                    android:textAlignment="center"
-                    android:textColor="@color/primary_dark"
-                    android:textSize="@dimen/text_size_medium"
-                    android:visibility="gone"/>
-
-                <android.support.constraint.ConstraintLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="horizontal"
-                    android:paddingBottom="2dp"
-                    android:paddingLeft="8dp"
-                    android:paddingRight="8dp"
-                    android:paddingTop="2dp"
-                    android:visibility="gone">
-
-                    <TextView
-                        android:id="@+id/tvBalanceLabel"
-                        android:layout_width="110dp"
-                        android:layout_height="wrap_content"
-                        android:fontFamily="@font/raleway_r"
-                        android:gravity="center_vertical"
-                        android:text="@string/balance"
-                        android:textColor="@color/primary_dark"
-                        android:textSize="@dimen/text_size_large"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent"/>
-
-                </android.support.constraint.ConstraintLayout>
-
-                <LinearLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:gravity="start"
-                    android:orientation="horizontal"
-                    android:paddingLeft="8dp"
-                    android:paddingRight="8dp"
-                    android:visibility="gone">
-
-                    <TextView
-                        android:id="@+id/tvOffline"
-                        android:layout_width="90dp"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center_vertical"
-                        android:layout_marginEnd="20dp"
-                        android:background="@color/msg_okay"
-                        android:fontFamily="@font/montserrat_light"
-                        android:text="@string/verified_offline"
                         android:textAlignment="center"
-                        android:textColor="@color/white"
-                        android:textSize="@dimen/text_size_small"/>
-
-                    <TextView
-                        android:id="@+id/tvBalanceEquivalent"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:fontFamily="@font/montserrat_light"
-                        android:textColor="@android:color/darker_gray"
-                        android:textSize="@dimen/text_size_medium"
-                        android:textStyle="normal|bold"
-                        tools:text="USD 0,00"/>
-
-                    <ImageView
-                        android:id="@+id/ivRateSource"
-                        android:layout_width="0dp"
-                        android:layout_height="18dp"
-                        android:layout_gravity="bottom|start"
-                        android:layout_weight="1"
-                        android:alpha="0.4"
-                        android:paddingEnd="8dp"
-                        android:paddingStart="8dp"
-                        android:src="@drawable/coinmarketcap"/>
-
-                </LinearLayout>
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="4dp"
-                    android:orientation="horizontal"
-                    android:paddingLeft="8dp"
-                    android:paddingRight="8dp"
-                    android:visibility="gone">
-
-                    <TextView
-                        android:layout_width="110dp"
-                        android:layout_height="wrap_content"
-                        android:fontFamily="@font/raleway_r"
-                        android:text="@string/blockchain"
-                        android:textColor="@color/primary_dark"/>
-
+                        tools:text="Do not accept! Wallet verification field. Tap again."/>
 
                 </LinearLayout>
 
@@ -309,105 +196,6 @@
 
                 </LinearLayout>
 
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="4dp"
-                    android:orientation="horizontal"
-                    android:paddingLeft="8dp"
-                    android:paddingRight="8dp"
-                    android:visibility="gone">
-
-                    <TextView
-                        android:id="@+id/tvInputs"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:fontFamily="@font/montserrat_light"
-                        android:textColor="@color/primary_dark"
-                        android:textSize="@dimen/text_size_small"
-                        android:textStyle="normal|bold"
-                        tools:text="@string/no_data_string"/>
-
-                </LinearLayout>
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="horizontal"
-                    android:paddingLeft="8dp"
-                    android:paddingRight="8dp"
-                    android:visibility="gone">
-
-                    <TextView
-                        android:layout_width="110dp"
-                        android:layout_height="wrap_content"
-                        android:fontFamily="@font/raleway_r"
-                        android:text="@string/issuer"
-                        android:textColor="@color/primary_dark"
-                        android:textSize="@dimen/text_size_small"/>
-
-                    <TextView
-                        android:id="@+id/tvIssuer"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:fontFamily="@font/montserrat_light"
-                        android:textColor="@color/primary_dark"
-                        android:textSize="@dimen/text_size_small"
-                        android:textStyle="normal|bold"
-                        tools:text="TANGEM"/>
-
-                </LinearLayout>
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="horizontal"
-                    android:paddingLeft="8dp"
-                    android:paddingRight="8dp"
-                    android:visibility="gone">
-
-                    <TextView
-                        android:layout_width="110dp"
-                        android:layout_height="wrap_content"
-                        android:fontFamily="@font/raleway_r"
-                        android:text="@string/validation_node"
-                        android:textColor="@color/primary_dark"
-                        android:textSize="@dimen/text_size_small"/>
-
-                    <TextView
-                        android:id="@+id/tvValidationNode"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:fontFamily="@font/montserrat_light"
-                        android:textColor="@color/primary_dark"
-                        android:textSize="@dimen/text_size_small"
-                        android:textStyle="normal|bold"
-                        tools:text="Electrum"/>
-
-                </LinearLayout>
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="horizontal"
-                    android:paddingLeft="8dp"
-                    android:paddingRight="8dp"
-                    android:visibility="gone">
-
-                    <TextView
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="2dp"
-                        android:layout_weight="1"
-                        android:fontFamily="@font/raleway_r"
-                        android:text="@string/swipe_down_to_refresh_data"
-                        android:textAlignment="center"
-                        android:textColor="@android:color/darker_gray"
-                        android:textSize="@dimen/text_size_small"/>
-
-                </LinearLayout>
-
             </LinearLayout>
 
         </RelativeLayout>
@@ -457,14 +245,10 @@
 
     <LinearLayout
         android:id="@+id/rlToolButtons"
-        android:layout_width="0dp"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="5dp"
         android:gravity="center"
-        app:layout_constraintBottom_toTopOf="@+id/rlCardIdAndIcons"
-        app:layout_constraintHorizontal_bias="0.0"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent">
+        app:layout_constraintBottom_toBottomOf="parent">
 
         <android.support.v7.widget.AppCompatButton
             android:id="@+id/btnLoad"
@@ -502,76 +286,4 @@
 
     </LinearLayout>
 
-    <!--not used-->
-    <RelativeLayout
-        android:id="@+id/rlCardIdAndIcons"
-        android:layout_width="match_parent"
-        android:layout_height="40dp"
-        android:visibility="gone"
-        app:layout_constraintBottom_toBottomOf="parent">
-
-        <ImageView
-            android:id="@+id/ivPIN"
-            android:layout_width="24dp"
-            android:layout_height="24dp"
-            android:layout_alignParentBottom="true"
-            android:layout_alignParentStart="false"
-            android:layout_marginBottom="8dp"
-            android:layout_marginStart="4dp"
-            android:layout_toStartOf="@+id/ivPIN2orSecurityDelay"
-            android:elevation="0dp"
-            android:src="@drawable/unlock_pin1"/>
-
-        <ImageView
-            android:id="@+id/ivPIN2orSecurityDelay"
-            android:layout_width="24dp"
-            android:layout_height="24dp"
-            android:layout_alignParentBottom="true"
-            android:layout_alignParentEnd="true"
-            android:layout_alignParentStart="false"
-            android:layout_marginBottom="8dp"
-            android:layout_marginStart="4dp"
-            android:elevation="0dp"
-            android:src="@drawable/unlock_pin2"/>
-
-        <ImageView
-            android:id="@+id/ivDeveloperVersion"
-            android:layout_width="24dp"
-            android:layout_height="24dp"
-            android:layout_alignParentBottom="true"
-            android:layout_alignParentStart="true"
-            android:layout_marginBottom="8dp"
-            android:layout_marginStart="4dp"
-            android:elevation="0dp"
-            android:src="@drawable/ic_developer_version"/>
-
-        <TextView
-            android:id="@+id/tvCardID"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_above="@+id/textView5"
-            android:layout_alignParentEnd="false"
-            android:layout_alignParentStart="true"
-            android:layout_alignWithParentIfMissing="false"
-            android:fontFamily="@font/montserrat_light"
-            android:textAlignment="center"
-            android:textColor="@color/primary_dark"
-            android:textSize="@dimen/text_size_medium"
-            android:textStyle="normal|bold"
-            tools:text="@string/no_data_string_1"/>
-
-        <TextView
-            android:id="@+id/textView5"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_alignParentBottom="true"
-            android:layout_alignParentStart="true"
-            android:fontFamily="@font/raleway_r"
-            android:text="@string/scan_again_to_verify_the_card"
-            android:textAlignment="center"
-            android:textColor="@android:color/darker_gray"
-            android:textSize="@dimen/text_size_small"/>
-
-    </RelativeLayout>
-
 </android.support.constraint.ConstraintLayout>
\ No newline at end of file