GiftedHacker/tangem-app-android-audited
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Updated on 2026-08-14

Browse source
This commit is contained in:
Tangem 2018-08-05 08:53:15 +03:00
parent 8c4495cb28
commit adb1aa178a
14 changed files with 165 additions and 168 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/build.gradle
View file

@ -16,7 +16,7 @@ android {
minSdkVersion 21
targetSdkVersion 27
versionCode 53
versionName "0.87.3." + generateVersionName()
versionName "0.88.1." + generateVersionName()
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
}
buildTypes {

26
app/src/main/java/com/tangem/domain/wallet/BalanceValidator.java
View file

@ -26,6 +26,8 @@ public class BalanceValidator {
public void Check(TangemCard card)
{
firstLine = "Verification failed";
secondLine = "";
@ -36,6 +38,15 @@ public class BalanceValidator {
secondLine = "Balance cannot be verified. Swipe down to refresh.";
return;
}
// Workaround before new back-end
// if (!HasEverSigned(card)) {
// firstLine = "Verified balance";
// secondLine = "Balance confirmed in blockchain. ";
// secondLine += "Verified note identity. ";
// return;
// }
// rule 2.a
if(!VerificationWalletKey(card)) {
score = 0;
@ -89,13 +100,14 @@ public class BalanceValidator {
}
// rule 4 TODO: need to check SignedHashed against number of outputs in blockchain
if(HasEverSigned(card) && card.getBalance() != 0)
{
score = 80;
firstLine = "Unguaranteed balance";
secondLine = "Potential unsent transaction. Redeem immediately if accept. ";
return;
}
// if(HasEverSigned(card) && card.getBalance() != 0)
// {
// score = 80;
// firstLine = "Unguaranteed balance";
// secondLine = "Potential unsent transaction. Redeem immediately if accept. ";
// return;
// }
// rule 7
if(CheckOfflineBalance(card) && !CheckOnlineBalance(card) && !HasEverSigned(card) && card.getBalance() != 0)
{

46
app/src/main/java/com/tangem/domain/wallet/TangemCard.java
View file

@ -1537,26 +1537,36 @@ public class TangemCard {
}
public int getCardImageResource() {
switch (getBlockchainID()) {
case "BTC":
if (bytesToHex(getDenomination()).equals("40420F0000000000"))
return R.drawable.card_btc001;
else if (bytesToHex(getDenomination()).equals("404B4C0000000000"))
return R.drawable.card_btc005;
else if (bytesToHex(getDenomination()).equals("0000000000000000"))
return R.drawable.card_btc_hk_s;
else
return R.drawable.card_default;
case "Token":
if (getTokenSymbol().equals("SEED"))
return R.drawable.card_seed;
else
return R.drawable.card_default;
default:
return R.drawable.card_default;
switch (getBatch()) {
case "0004": case "0006": case "0010": return R.drawable.card_btc001;
case "0005": case "0007": case "0011": return R.drawable.card_btc005;
case "0012": return R.drawable.card_seed;
case "0013": return R.drawable.card_btc_hk_s;
case "0015": return R.drawable.card_default; //TODO: new BTC 0.00
case "0016": return R.drawable.card_default; // TODO: new ETH 0.00
default: return R.drawable.card_default;
}
// switch (getBlockchainID()) {
// case "BTC":
// if (bytesToHex(getDenomination()).equals("40420F0000000000"))
// return R.drawable.card_btc001;
// else if (bytesToHex(getDenomination()).equals("404B4C0000000000"))
// return R.drawable.card_btc005;
// else if (bytesToHex(getDenomination()).equals("0000000000000000"))
// return R.drawable.card_btc_hk_s;
// else
// return R.drawable.card_default;
//
// case "Token":
// if (getTokenSymbol().equals("SEED"))
// return R.drawable.card_seed;
// else
// return R.drawable.card_default;
//
// default:
// return R.drawable.card_default;
// }
}

28
app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.kt
View file

@ -162,21 +162,13 @@ class LoadedWallet : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific
// set listeners
srlLoadedWallet!!.setOnRefreshListener { this.refresh() }
ivLookup.setOnClickListener {
btnLookup.setOnClickListener {
val engineClick = CoinEngineFactory.Create(mCard!!.blockchain)
val browserIntent = Intent(Intent.ACTION_VIEW, engineClick!!.getShareWalletURIExplorer(mCard))
startActivity(browserIntent)
}
tvLookup.setOnClickListener {
val engineClick = CoinEngineFactory.Create(mCard!!.blockchain)
val browserIntent = Intent(Intent.ACTION_VIEW, engineClick!!.getShareWalletURIExplorer(mCard))
startActivity(browserIntent)
}
ivCopy.setOnClickListener { doShareWallet(false) }
tvCopy.setOnClickListener { doShareWallet(false) }
btnCopy.setOnClickListener { doShareWallet(false) }
tvWallet.setOnClickListener { doShareWallet(false) }
@ -192,26 +184,14 @@ class LoadedWallet : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific
}
}
fabInfo.setOnClickListener {
btnDetails.setOnClickListener {
if (mCardProtocol != null)
openVerifyCard(mCardProtocol!!)
else
showSingleToast(R.string.need_attach_card_again)
}
tvInfo.setOnClickListener {
if (mCardProtocol != null)
openVerifyCard(mCardProtocol!!)
else
showSingleToast(R.string.need_attach_card_again)
}
fabNFC.setOnClickListener {
val intent = Intent(context, MainActivity::class.java)
startActivity(intent)
}
tvNFC.setOnClickListener {
btnScanAgain.setOnClickListener {
val intent = Intent(context, MainActivity::class.java)
startActivity(intent)
}

5
app/src/main/java/com/tangem/util/UtilHelper.kt
View file

@ -13,8 +13,9 @@ object UtilHelper {
@Throws(WriterException::class)
fun generateQrCode(myCodeText: String): Bitmap {
val hintMap = Hashtable<EncodeHintType, ErrorCorrectionLevel>()
hintMap[EncodeHintType.ERROR_CORRECTION] = ErrorCorrectionLevel.H // H = 30% damage
val hintMap = Hashtable<EncodeHintType, Any>()
hintMap[EncodeHintType.ERROR_CORRECTION] = ErrorCorrectionLevel.M // H = 30% damage
hintMap[EncodeHintType.MARGIN] = 2
val qrCodeWriter = QRCodeWriter()

2
app/src/main/res/drawable/ic_content_copy_black_24dp.xml
View file

@ -4,5 +4,5 @@
android:width="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path android:fillColor="#000" android:pathData="M19,21H8V7H19M19,5H8A2,2 0 0,0 6,7V21A2,2 0 0,0 8,23H19A2,2 0 0,0 21,21V7A2,2 0 0,0 19,5M16,1H4A2,2 0 0,0 2,3V17H4V3H16V1Z" />
<path android:fillColor="@color/colorPrimary" android:pathData="M19,21H8V7H19M19,5H8A2,2 0 0,0 6,7V21A2,2 0 0,0 8,23H19A2,2 0 0,0 21,21V7A2,2 0 0,0 19,5M16,1H4A2,2 0 0,0 2,3V17H4V3H16V1Z" />
</vector>

5
app/src/main/res/drawable/ic_explore_black_24dp.xml Normal file
View file

@ -0,0 +1,5 @@
<vector android:height="24dp" android:tint="#027AFF"
android:viewportHeight="24.0" android:viewportWidth="24.0"
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#FF000000" android:pathData="M12,10.9c-0.61,0 -1.1,0.49 -1.1,1.1s0.49,1.1 1.1,1.1c0.61,0 1.1,-0.49 1.1,-1.1s-0.49,-1.1 -1.1,-1.1zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM14.19,14.19L6,18l3.81,-8.19L18,6l-3.81,8.19z"/>
</vector>

8
app/src/main/res/drawable/ic_information_variant_white_24dp.xml
View file

@ -1,8 +0,0 @@
<!-- drawable/information-variant.xml -->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:height="24dp"
android:width="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path android:fillColor="#fff" android:pathData="M13.5,4A1.5,1.5 0 0,0 12,5.5A1.5,1.5 0 0,0 13.5,7A1.5,1.5 0 0,0 15,5.5A1.5,1.5 0 0,0 13.5,4M13.14,8.77C11.95,8.87 8.7,11.46 8.7,11.46C8.5,11.61 8.56,11.6 8.72,11.88C8.88,12.15 8.86,12.17 9.05,12.04C9.25,11.91 9.58,11.7 10.13,11.36C12.25,10 10.47,13.14 9.56,18.43C9.2,21.05 11.56,19.7 12.17,19.3C12.77,18.91 14.38,17.8 14.54,17.69C14.76,17.54 14.6,17.42 14.43,17.17C14.31,17 14.19,17.12 14.19,17.12C13.54,17.55 12.35,18.45 12.19,17.88C12,17.31 13.22,13.4 13.89,10.71C14,10.07 14.3,8.67 13.14,8.77Z" />
</vector>

2
app/src/main/res/drawable/ic_nfc_white_24dp.xml
View file

@ -4,5 +4,5 @@
android:width="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path android:fillColor="#fff" android:pathData="M10.59,7.66C10.59,7.66 11.19,7.39 11.57,7.82C11.95,8.26 12.92,9.94 12.92,11.62C12.92,13.3 12.5,15.09 12.05,15.68C11.62,16.28 11.19,16.28 10.86,16.06C10.54,15.85 5.5,12 5.23,11.89C4.95,11.78 4.85,12.05 5.12,13.5C5.39,15 4.95,15.41 4.57,15.47C4.2,15.5 3.06,15.2 3,12.16C2.95,9.13 3.76,8.64 4.14,8.64C4.85,8.64 10.27,13.5 10.64,13.46C10.97,13.41 11.13,11.35 10.5,9.72C9.78,7.96 10.59,7.66 10.59,7.66M19.3,4.63C21.12,8.24 21,11.66 21,12C21,12.34 21.12,15.76 19.3,19.37C19.3,19.37 18.83,19.92 18.12,19.59C17.42,19.26 17.66,18.4 17.66,18.4C17.66,18.4 19.14,15.55 19.1,12.05V12C19.14,8.5 17.66,5.6 17.66,5.6C17.66,5.6 17.42,4.74 18.12,4.41C18.83,4.08 19.3,4.63 19.3,4.63M15.77,6.25C17.26,8.96 17.16,11.66 17.14,12C17.16,12.34 17.26,14.92 15.77,17.85C15.77,17.85 15.3,18.4 14.59,18.07C13.89,17.74 14.13,16.88 14.13,16.88C14.13,16.88 15.09,15.5 15.24,12.05V12C15.14,8.53 14.13,7.23 14.13,7.23C14.13,7.23 13.89,6.36 14.59,6.04C15.3,5.71 15.77,6.25 15.77,6.25Z" />
<path android:fillColor="@color/colorPrimary" android:pathData="M10.59,7.66C10.59,7.66 11.19,7.39 11.57,7.82C11.95,8.26 12.92,9.94 12.92,11.62C12.92,13.3 12.5,15.09 12.05,15.68C11.62,16.28 11.19,16.28 10.86,16.06C10.54,15.85 5.5,12 5.23,11.89C4.95,11.78 4.85,12.05 5.12,13.5C5.39,15 4.95,15.41 4.57,15.47C4.2,15.5 3.06,15.2 3,12.16C2.95,9.13 3.76,8.64 4.14,8.64C4.85,8.64 10.27,13.5 10.64,13.46C10.97,13.41 11.13,11.35 10.5,9.72C9.78,7.96 10.59,7.66 10.59,7.66M19.3,4.63C21.12,8.24 21,11.66 21,12C21,12.34 21.12,15.76 19.3,19.37C19.3,19.37 18.83,19.92 18.12,19.59C17.42,19.26 17.66,18.4 17.66,18.4C17.66,18.4 19.14,15.55 19.1,12.05V12C19.14,8.5 17.66,5.6 17.66,5.6C17.66,5.6 17.42,4.74 18.12,4.41C18.83,4.08 19.3,4.63 19.3,4.63M15.77,6.25C17.26,8.96 17.16,11.66 17.14,12C17.16,12.34 17.26,14.92 15.77,17.85C15.77,17.85 15.3,18.4 14.59,18.07C13.89,17.74 14.13,16.88 14.13,16.88C14.13,16.88 15.09,15.5 15.24,12.05V12C15.14,8.53 14.13,7.23 14.13,7.23C14.13,7.23 13.89,6.36 14.59,6.04C15.3,5.71 15.77,6.25 15.77,6.25Z" />
</vector>

9
app/src/main/res/drawable/ic_settings_black_24dp.xml Normal file
View file

@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="@color/colorPrimary"
android:pathData="M19.43,12.98c0.04,-0.32 0.07,-0.64 0.07,-0.98s-0.03,-0.66 -0.07,-0.98l2.11,-1.65c0.19,-0.15 0.24,-0.42 0.12,-0.64l-2,-3.46c-0.12,-0.22 -0.39,-0.3 -0.61,-0.22l-2.49,1c-0.52,-0.4 -1.08,-0.73 -1.69,-0.98l-0.38,-2.65C14.46,2.18 14.25,2 14,2h-4c-0.25,0 -0.46,0.18 -0.49,0.42l-0.38,2.65c-0.61,0.25 -1.17,0.59 -1.69,0.98l-2.49,-1c-0.23,-0.09 -0.49,0 -0.61,0.22l-2,3.46c-0.13,0.22 -0.07,0.49 0.12,0.64l2.11,1.65c-0.04,0.32 -0.07,0.65 -0.07,0.98s0.03,0.66 0.07,0.98l-2.11,1.65c-0.19,0.15 -0.24,0.42 -0.12,0.64l2,3.46c0.12,0.22 0.39,0.3 0.61,0.22l2.49,-1c0.52,0.4 1.08,0.73 1.69,0.98l0.38,2.65c0.03,0.24 0.24,0.42 0.49,0.42h4c0.25,0 0.46,-0.18 0.49,-0.42l0.38,-2.65c0.61,-0.25 1.17,-0.59 1.69,-0.98l2.49,1c0.23,0.09 0.49,0 0.61,-0.22l2,-3.46c0.12,-0.22 0.07,-0.49 -0.12,-0.64l-2.11,-1.65zM12,15.5c-1.93,0 -3.5,-1.57 -3.5,-3.5s1.57,-3.5 3.5,-3.5 3.5,1.57 3.5,3.5 -1.57,3.5 -3.5,3.5z"/>
</vector>

3
app/src/main/res/layout/activity_main.xml
View file

@ -121,12 +121,13 @@
android:layout_marginTop="24dp"
android:fontFamily="@font/maax"
android:gravity="top"
android:lineSpacingExtra="8sp"
android:text="@string/tap_tangem_card"
android:textAlignment="center"
android:textAllCaps="false"
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
android:textColor="@color/primary_dark"
android:textSize="@dimen/text_size_medium"/>
android:textSize="@dimen/text_size_medium" />
</LinearLayout>

186
app/src/main/res/layout/fr_loaded_wallet.xml
View file

@ -23,32 +23,35 @@
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="1.0">
<LinearLayout
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="match_parent"
android:layout_alignParentBottom="false"
android:background="@color/white"
android:gravity="center"
android:orientation="vertical">
<RelativeLayout
android:id="@+id/loCard"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="10dp"
android:layout_marginTop="10dp">
android:layout_height="0dp"
app:layout_constraintBottom_toTopOf="@+id/loBalance"
app:layout_constraintTop_toTopOf="parent">
<ImageView
android:id="@+id/ivTangemCard"
android:layout_width="match_parent"
android:layout_height="180dp"
android:layout_height="match_parent"
android:padding="5dp"
tools:src="@drawable/card_default" />
<RelativeLayout
android:id="@+id/rlProgressBar"
android:layout_width="match_parent"
android:layout_height="180dp"
android:layout_height="match_parent"
android:layout_centerHorizontal="true"
android:elevation="3dp"
android:padding="5dp"
android:visibility="gone"
tools:visibility="visible">
@ -83,15 +86,17 @@
</RelativeLayout>
<LinearLayout
android:id="@+id/loBalance"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginEnd="5dp"
android:layout_marginStart="5dp"
android:orientation="vertical">
android:orientation="vertical"
app:layout_constraintBottom_toTopOf="@+id/loWallet"
tools:layout_editor_absoluteX="5dp">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginBottom="10dp"
android:gravity="center_vertical"
android:orientation="horizontal">
@ -124,11 +129,9 @@
android:id="@+id/tvBalanceLine1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:fontFamily="@font/maaxmedium"
android:textAlignment="center"
android:textColor="@color/msg_err"
android:textSize="@dimen/text_size_medium"
android:visibility="invisible"
tools:text="Verification field" />
<TextView
@ -140,26 +143,30 @@
android:paddingEnd="5dp"
android:paddingStart="5dp"
android:textAlignment="center"
android:visibility="gone"
tools:text="Do not accept! Wallet verification field. Tap again." />
</LinearLayout>
<LinearLayout
android:id="@+id/loWallet"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:orientation="horizontal"
android:paddingLeft="8dp"
android:paddingRight="8dp">
app:layout_constraintBottom_toBottomOf="parent">
<ImageView
android:id="@+id/ivQR"
android:layout_width="@dimen/size_qr_image"
android:layout_height="@dimen/size_qr_image" />
android:layout_width="0dp"
android:layout_height="@dimen/size_qr_image"
android:layout_weight="1" />
<LinearLayout
android:layout_width="match_parent"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center_vertical|center_horizontal"
android:orientation="vertical">
@ -167,72 +174,53 @@
android:id="@+id/tvWallet"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="10dp"
android:layout_marginRight="4dp"
android:fontFamily="@font/maax"
android:textAlignment="center"
android:textColor="@android:color/black"
android:textSize="@dimen/text_size_1_small"
tools:text="1DoQdnSYshhZ5Tqt5Sk6svZt29jqoYVwQY" />
<LinearLayout
<android.support.v7.widget.AppCompatButton
android:id="@+id/btnLookup"
style="@style/AppTheme.RoundedCornerMaterialButton"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="15dp"
android:gravity="center"
android:orientation="horizontal">
android:layout_height="34dp"
android:layout_marginBottom="5dp"
android:layout_marginTop="10dp"
android:layout_weight="1"
android:backgroundTint="@color/white"
android:drawableLeft="@drawable/ic_explore_black_24dp"
android:elevation="15dp"
android:fontFamily="@font/saira_condensed_bold"
android:paddingLeft="20dp"
android:paddingRight="20dp"
android:text="@string/explore"
android:textColor="@color/primary_dark" />
<ImageView
android:id="@+id/ivLookup"
android:layout_width="@dimen/size_explore_image"
android:layout_height="@dimen/size_explore_image"
android:baselineAlignBottom="false"
android:src="@drawable/chain_lookup" />
<TextView
android:id="@+id/tvLookup"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="@font/saira_condensed_bold"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:text="@string/explore"
android:textColor="@color/primary"
android:textSize="@dimen/text_size_medium" />
</LinearLayout>
<LinearLayout
<android.support.v7.widget.AppCompatButton
android:id="@+id/btnCopy"
style="@style/AppTheme.RoundedCornerMaterialButton"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="15dp"
android:gravity="center"
android:orientation="horizontal">
<ImageView
android:id="@+id/ivCopy"
android:layout_width="@dimen/size_explore_image"
android:layout_height="@dimen/size_explore_image"
android:baselineAlignBottom="false"
android:src="@drawable/ic_content_copy_black_24dp"
android:tint="@color/colorPrimary" />
<TextView
android:id="@+id/tvCopy"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="@font/saira_condensed_bold"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:text="@string/copy"
android:textColor="@color/primary"
android:textSize="@dimen/text_size_medium" />
</LinearLayout>
android:layout_height="34dp"
android:layout_marginBottom="5dp"
android:layout_marginTop="10dp"
android:layout_weight="1"
android:backgroundTint="@color/white"
android:drawableLeft="@drawable/ic_content_copy_black_24dp"
android:elevation="15dp"
android:fontFamily="@font/saira_condensed_bold"
android:paddingLeft="20dp"
android:paddingRight="20dp"
android:text="@string/copy"
android:textColor="@color/primary_dark" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
</android.support.constraint.ConstraintLayout>>
</android.support.v4.widget.SwipeRefreshLayout>
@ -333,23 +321,22 @@
android:orientation="horizontal"
android:paddingBottom="10dp">
<android.support.design.widget.FloatingActionButton
android:id="@+id/fabInfo"
android:layout_width="wrap_content"
android:layout_height="30dp"
app:backgroundTint="@color/colorPrimary"
app:fabSize="mini"
app:srcCompat="@drawable/ic_information_variant_white_24dp" />
<TextView
android:id="@+id/tvInfo"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
<android.support.v7.widget.AppCompatButton
android:id="@+id/btnDetails"
style="@style/AppTheme.RoundedCornerMaterialButton"
android:layout_width="0dp"
android:layout_height="34dp"
android:layout_marginBottom="5dp"
android:layout_marginTop="5dp"
android:layout_weight="1"
android:backgroundTint="@color/white"
android:drawableLeft="@drawable/ic_settings_black_24dp"
android:elevation="15dp"
android:fontFamily="@font/saira_condensed_bold"
android:paddingLeft="10dp"
android:paddingLeft="20dp"
android:paddingRight="20dp"
android:text="@string/details"
android:textColor="@color/primary"
android:textSize="@dimen/text_size_medium" />
android:textColor="@color/primary_dark" />
</LinearLayout>
@ -361,23 +348,22 @@
android:orientation="horizontal"
android:paddingBottom="10dp">
<android.support.design.widget.FloatingActionButton
android:id="@+id/fabNFC"
android:layout_width="wrap_content"
android:layout_height="30dp"
app:backgroundTint="@color/colorPrimary"
app:fabSize="mini"
app:srcCompat="@drawable/ic_nfc_white_24dp" />
<TextView
android:id="@+id/tvNFC"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
<android.support.v7.widget.AppCompatButton
android:id="@+id/btnScanAgain"
style="@style/AppTheme.RoundedCornerMaterialButton"
android:layout_width="0dp"
android:layout_height="34dp"
android:layout_marginBottom="5dp"
android:layout_marginTop="5dp"
android:layout_weight="1"
android:backgroundTint="@color/white"
android:drawableLeft="@drawable/ic_nfc_white_24dp"
android:elevation="15dp"
android:fontFamily="@font/saira_condensed_bold"
android:paddingLeft="10dp"
android:paddingLeft="20dp"
android:paddingRight="20dp"
android:text="@string/new_scan"
android:textColor="@color/primary"
android:textSize="@dimen/text_size_medium" />
android:textColor="@color/primary_dark" />
</LinearLayout>
</LinearLayout>

9
app/src/main/res/layout/fr_verify_card.xml
View file

@ -452,12 +452,13 @@
<TextView
android:id="@+id/tvWallet"
android:layout_width="match_parent"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:fontFamily="@font/maax"
android:gravity="start|center_vertical"
android:singleLine="true"
android:textColor="@color/primary_dark"
android:textSize="@dimen/text_size_1_small"
android:textSize="@dimen/text_size_2_small"
android:textStyle="normal|bold"
tools:text="1DoQdnSYshhZ5Tqt5Sk6svZt29jqoYVwQY" />
@ -507,7 +508,7 @@
android:layout_height="wrap_content"
android:fontFamily="@font/maax"
android:textColor="@color/primary_dark"
android:textSize="@dimen/text_size_1_small"
android:textSize="@dimen/text_size_2_small"
android:textStyle="normal|bold"
tools:text="Electrum" />
@ -532,7 +533,7 @@
android:layout_height="wrap_content"
android:fontFamily="@font/maax"
android:textColor="@color/primary_dark"
android:textSize="@dimen/text_size_1_small"
android:textSize="@dimen/text_size_2_small"
android:textStyle="normal|bold"
tools:text="1 unspent" />

2
app/src/main/res/values/colors.xml
View file

@ -20,7 +20,7 @@
<color name="msg_err">#BFFF4444</color>
<color name="msg_start">#4a086e</color>
<color name="msg_action">#0c15c1</color>
<color name="btn_light">#e3e3e3</color>
<color name="btn_light">#FFE3E3E3</color>
<color name="btn_dark">#FFC3C3C3</color>
<color name="bg_material_dark">#303030</color>
<color name="actionbar_text">@color/white</color>