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-02 12:37:20 +03:00
parent de96b85fd4
commit 0a19005b1d
27 changed files with 262 additions and 235 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -18,7 +18,7 @@ public class BalanceValidator {
else { return "Do not accept! " + secondLine;}
}
public int GetColor() {
if (score>89) { return R.color.msg_okay;}
if (score>89) { return R.color.confirmed;}
else if (score>74) { return android.R.color.holo_orange_light;}
else if (score>0) { return android.R.color.holo_orange_dark;}
else { return android.R.color.holo_red_light;}

10
app/src/main/java/com/tangem/presentation/activity/MainActivity.kt
View file

@ -202,11 +202,11 @@ class MainActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, CardProtoco
return true
}
R.id.cleanCards -> {
onCardsClean!!.doClean()
llTapPrompt.visibility = View.VISIBLE
return true
}
// R.id.cleanCards -> {
// onCardsClean!!.doClean()
// llTapPrompt.visibility = View.VISIBLE
// return true
// }
R.id.about -> {
showLogoActivity()

BIN
app/src/main/res/drawable/chain_lookup.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 12 KiB

Before After
Before After

BIN
app/src/main/res/font/montserrat_light.otf
View file

Binary file not shown.

BIN
app/src/main/res/font/raleway_el.ttf
View file

Binary file not shown.

BIN
app/src/main/res/font/raleway_r.ttf
View file

Binary file not shown.

BIN
app/src/main/res/font/saira_condensed_light.ttf Normal file
View file

Binary file not shown.

81
app/src/main/res/layout/activity_confirm_payment.xml
View file

@ -11,7 +11,7 @@
android:id="@+id/textView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fontFamily="@font/raleway_r"
android:fontFamily="@font/maax"
android:paddingBottom="4dp"
android:paddingTop="8dp"
android:text="@string/send_payment"
@ -26,6 +26,7 @@
android:id="@+id/llPayment"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:background="@color/btn_light"
android:orientation="vertical"
android:paddingBottom="8dp"
@ -38,11 +39,10 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="7dp"
android:fontFamily="@font/raleway_r"
android:fontFamily="@font/maax"
android:text="@string/from_banknote"
android:textColor="@color/primary"
android:textSize="@dimen/text_size_medium"/>
android:textSize="@dimen/text_size_medium" />
<TextView
android:id="@+id/tvCardID"
@ -50,21 +50,20 @@
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="4dp"
android:fontFamily="@font/montserrat_light"
android:fontFamily="@font/maax"
android:textColor="@color/black"
android:textSize="@dimen/text_size_medium"
android:textStyle="bold"
tools:text="BB00 0000 1210 0233"/>
tools:text="BB00 0000 1210 0233" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="7dp"
android:layout_marginTop="6dp"
android:fontFamily="@font/raleway_r"
android:fontFamily="@font/maax"
android:text="@string/with_balance"
android:textColor="@color/primary"
android:textSize="@dimen/text_size_medium"/>
android:textSize="@dimen/text_size_medium" />
<TextView
android:id="@+id/tvBalance"
@ -72,11 +71,11 @@
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="4dp"
android:fontFamily="@font/montserrat_light"
android:fontFamily="@font/maax"
android:textColor="@color/black"
android:textSize="@dimen/text_size_medium"
android:textStyle="bold"
tools:text="4.51735 mBtc"/>
tools:text="4.51735 mBtc" />
<android.support.constraint.ConstraintLayout
android:layout_width="match_parent"
@ -88,15 +87,14 @@
android:id="@+id/textView2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="7dp"
android:layout_marginTop="8dp"
android:fontFamily="@font/raleway_r"
android:fontFamily="@font/maax"
android:text="@string/send_to_wallet"
android:textColor="@color/primary"
android:textSize="@dimen/text_size_medium"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent"/>
app:layout_constraintTop_toTopOf="parent" />
</android.support.constraint.ConstraintLayout>
@ -105,13 +103,13 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:enabled="false"
android:fontFamily="@font/montserrat_light"
android:fontFamily="@font/maax"
android:hint="@string/target_wallet_address"
android:inputType="text"
android:padding="12dp"
android:textColor="@color/black"
android:textSize="@dimen/text_size_1_small"
android:textStyle="bold"/>
android:textStyle="bold" />
<android.support.constraint.ConstraintLayout
android:layout_width="match_parent"
@ -121,28 +119,26 @@
android:id="@+id/textView3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="7dp"
android:layout_marginTop="16dp"
android:fontFamily="@font/raleway_r"
android:fontFamily="@font/maax"
android:text="@string/amount"
android:textColor="@color/primary"
android:textSize="@dimen/text_size_medium"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent"/>
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/textView12"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="1dp"
android:layout_marginStart="4dp"
android:fontFamily="@font/raleway_r"
android:fontFamily="@font/maax"
android:text="@string/including_fee"
android:textColor="@color/primary"
android:textSize="14sp"
app:layout_constraintBottom_toBottomOf="@+id/textView3"
app:layout_constraintLeft_toRightOf="@+id/textView3"/>
app:layout_constraintLeft_toRightOf="@+id/textView3" />
</android.support.constraint.ConstraintLayout>
@ -155,7 +151,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:enabled="false"
android:fontFamily="@font/montserrat_light"
android:fontFamily="@font/maax"
android:hint="@string/payment_amount"
android:inputType="numberDecimal"
android:padding="12dp"
@ -165,7 +161,7 @@
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"/>
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/tvCurrency"
@ -175,13 +171,13 @@
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:fontFamily="@font/montserrat_light"
android:fontFamily="@font/maax"
android:text="@string/m_btc"
android:textSize="@dimen/text_size_large"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/etAmount"
app:layout_constraintTop_toTopOf="parent"/>
app:layout_constraintTop_toTopOf="parent" />
</android.support.constraint.ConstraintLayout>
@ -206,13 +202,13 @@
android:layout_marginBottom="4dp"
android:layout_marginStart="7dp"
android:layout_marginTop="16dp"
android:fontFamily="@font/raleway_r"
android:fontFamily="@font/maax"
android:text="@string/fee"
android:textColor="@color/primary"
android:textSize="@dimen/text_size_medium"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent"/>
app:layout_constraintTop_toTopOf="parent" />
<info.hoang8f.android.segmented.SegmentedGroup
xmlns:app="http://schemas.android.com/apk/res-auto"
@ -232,27 +228,27 @@
style="@style/RadioButton"
android:layout_width="100dp"
android:layout_height="wrap_content"
android:fontFamily="@font/raleway_r"
android:fontFamily="@font/saira_condensed_bold"
android:text="@string/minimal"
android:textSize="@dimen/text_size_medium"/>
android:textSize="@dimen/text_size_medium" />
<RadioButton
android:id="@+id/rbNormalFee"
style="@style/RadioButton"
android:layout_width="100dp"
android:layout_height="wrap_content"
android:fontFamily="@font/raleway_r"
android:fontFamily="@font/saira_condensed_bold"
android:text="@string/normal"
android:textSize="@dimen/text_size_medium"/>
android:textSize="@dimen/text_size_medium" />
<RadioButton
android:id="@+id/rbMaximumFee"
style="@style/RadioButton"
android:layout_width="100dp"
android:layout_height="wrap_content"
android:fontFamily="@font/raleway_r"
android:fontFamily="@font/saira_condensed_bold"
android:text="@string/priority"
android:textSize="@dimen/text_size_medium"/>
android:textSize="@dimen/text_size_medium" />
</info.hoang8f.android.segmented.SegmentedGroup>
@ -267,9 +263,8 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginBottom="4dp"
android:layout_marginStart="8dp"
android:enabled="false"
android:fontFamily="@font/raleway_r"
android:fontFamily="@font/maax"
android:hint="@string/fee"
android:inputType="numberDecimal"
android:padding="12dp"
@ -280,28 +275,27 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintWidth_min="150dp"/>
app:layout_constraintWidth_min="150dp" />
<TextView
android:id="@+id/tvCurrency2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:fontFamily="@font/montserrat_light"
android:fontFamily="@font/maax"
android:text="@string/m_btc"
android:textSize="@dimen/text_size_medium"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toRightOf="@+id/etFee"
app:layout_constraintTop_toTopOf="parent"/>
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/tvFeeEquivalent"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:fontFamily="@font/montserrat_light"
android:fontFamily="@font/maax"
android:paddingEnd="10dp"
android:paddingStart="10dp"
android:textColor="@android:color/darker_gray"
@ -318,11 +312,14 @@
android:id="@+id/btnSend"
style="@style/AppTheme.RoundedCornerMaterialButton"
android:layout_width="match_parent"
android:layout_height="50dp"
android:layout_marginBottom="16dp"
android:fontFamily="@font/saira_condensed_bold"
android:text="@string/send_1"
android:textSize="@dimen/text_size_large"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"/>
app:layout_constraintRight_toRightOf="parent" />
<ProgressBar
android:id="@+id/progressBar"

6
app/src/main/res/layout/activity_create_new_wallet.xml
View file

@ -15,7 +15,7 @@
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fontFamily="@font/raleway_r"
android:fontFamily="@font/maax"
android:text="@string/now_touch_the_banknote_with_id"
android:textAlignment="center"
android:textSize="@dimen/text_size_medium"/>
@ -26,7 +26,7 @@
android:layout_height="wrap_content"
android:layout_marginBottom="10dp"
android:layout_marginTop="10dp"
android:fontFamily="@font/montserrat_light"
android:fontFamily="@font/maax"
android:textAlignment="center"
android:textColor="@color/black"
android:textSize="@dimen/text_size_large"
@ -35,7 +35,7 @@
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fontFamily="@font/raleway_r"
android:fontFamily="@font/maax"
android:text="@string/to_create_the_wallet"
android:textAlignment="center"
android:textSize="@dimen/text_size_medium"/>

23
app/src/main/res/layout/activity_empty_wallet.xml
View file

@ -29,7 +29,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:fontFamily="@font/raleway_r"
android:fontFamily="@font/maax"
android:gravity="center_vertical"
android:text="@string/wallet_has_not_been_yet_created"
android:textAlignment="center"
@ -39,8 +39,11 @@
android:id="@+id/btnNewWallet"
style="@style/AppTheme.RoundedCornerMaterialButton"
android:layout_width="match_parent"
android:layout_height="50dp"
android:layout_margin="32dp"
android:text="@string/create_wallet"/>
android:fontFamily="@font/saira_condensed_bold"
android:text="@string/create_wallet"
android:textSize="@dimen/text_size_large" />
<LinearLayout
android:layout_width="match_parent"
@ -51,7 +54,7 @@
android:layout_width="@dimen/empty_wallet_left_col_width"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/empty_wallet_left_col_margin"
android:fontFamily="@font/raleway_r"
android:fontFamily="@font/maax"
android:text="@string/blockchain"
android:textColor="@color/primary_dark"
android:textSize="@dimen/text_size_1_small"/>
@ -60,7 +63,7 @@
android:id="@+id/tvBlockchain"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="@font/montserrat_light"
android:fontFamily="@font/maax"
android:textColor="@color/primary_dark"
android:textSize="@dimen/text_size_1_small"
android:textStyle="normal|bold"
@ -77,7 +80,7 @@
android:layout_width="@dimen/empty_wallet_left_col_width"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/empty_wallet_left_col_margin"
android:fontFamily="@font/raleway_r"
android:fontFamily="@font/maax"
android:text="@string/issuer"
android:textColor="@color/primary_dark"
android:textSize="@dimen/text_size_1_small"/>
@ -86,7 +89,7 @@
android:id="@+id/tvIssuer"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="@font/montserrat_light"
android:fontFamily="@font/maax"
android:textColor="@color/primary_dark"
android:textSize="@dimen/text_size_1_small"
android:textStyle="normal|bold"
@ -103,14 +106,14 @@
android:layout_width="@dimen/empty_wallet_left_col_width"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/empty_wallet_left_col_margin"
android:fontFamily="@font/raleway_r"
android:fontFamily="@font/maax"
android:text=""/>
<TextView
android:id="@+id/tvIssuerData"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="@font/montserrat_light"
android:fontFamily="@font/maax"
android:textSize="@dimen/text_size_1_small"
android:textStyle="normal|bold"
tools:text="11111"/>
@ -130,7 +133,7 @@
android:id="@+id/tvCardID"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fontFamily="@font/montserrat_light"
android:fontFamily="@font/maax"
android:text="@string/no_data_string_1"
android:textAlignment="center"
android:textColor="@color/primary_dark"
@ -141,7 +144,7 @@
android:id="@+id/textView5"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fontFamily="@font/raleway_r"
android:fontFamily="@font/maax"
android:text="@string/scan_again_to_verify_the_card"
android:textAlignment="center"
android:textColor="@android:color/darker_gray"

4
app/src/main/res/layout/activity_logo.xml
View file

@ -22,7 +22,7 @@
android:layout_width="match_parent"
android:layout_height="200dp"
android:layout_gravity="bottom"
android:fontFamily="@font/raleway_r"
android:fontFamily="@font/maax"
android:gravity="center_horizontal"
android:text="@string/beta"
android:textAlignment="center"
@ -36,7 +36,7 @@
android:layout_gravity="bottom"
android:layout_marginBottom="8dp"
android:layout_marginTop="24dp"
android:fontFamily="@font/raleway_el"
android:fontFamily="@font/maax"
android:gravity="bottom"
android:text="@string/smart_cash_ag"
android:textAlignment="center"

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

@ -119,7 +119,7 @@
android:layout_marginLeft="24dp"
android:layout_marginRight="24dp"
android:layout_marginTop="24dp"
android:fontFamily="@font/raleway_el"
android:fontFamily="@font/maax"
android:gravity="top"
android:text="@string/tap_tangem_card"
android:textAlignment="center"

34
app/src/main/res/layout/activity_prepare_payment.xml
View file

@ -11,7 +11,7 @@
android:id="@+id/textView"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:fontFamily="@font/raleway_r"
android:fontFamily="@font/maax"
android:paddingBottom="8dp"
android:paddingTop="8dp"
android:text="@string/send_payment"
@ -42,7 +42,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="7dp"
android:layout_marginTop="8dp"
android:fontFamily="@font/raleway_r"
android:fontFamily="@font/maax"
android:text="@string/from_banknote"
android:textColor="@color/primary"
android:textSize="@dimen/text_size_medium"/>
@ -53,7 +53,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="4dp"
android:fontFamily="@font/montserrat_light"
android:fontFamily="@font/maax"
android:textColor="@color/black"
android:textSize="@dimen/text_size_medium"
android:textStyle="bold"
@ -64,7 +64,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="7dp"
android:layout_marginTop="12dp"
android:fontFamily="@font/raleway_r"
android:fontFamily="@font/maax"
android:text="@string/with_balance"
android:textColor="@color/primary"
android:textSize="@dimen/text_size_medium"/>
@ -81,7 +81,7 @@
android:layout_marginBottom="2dp"
android:layout_marginStart="16dp"
android:layout_marginTop="4dp"
android:fontFamily="@font/montserrat_light"
android:fontFamily="@font/maax"
android:textColor="@color/black"
android:textSize="@dimen/text_size_medium"
android:textStyle="bold"
@ -113,7 +113,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginTop="4dp"
android:fontFamily="@font/raleway_r"
android:fontFamily="@font/maax"
android:text="@string/send_to_wallet"
android:textColor="@color/primary"
android:textSize="@dimen/text_size_medium"
@ -139,7 +139,7 @@
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:fontFamily="@font/montserrat_light"
android:fontFamily="@font/maax"
android:hint="@string/enter_wallet_address"
android:inputType="text|textMultiLine|textNoSuggestions"
android:padding="12dp"
@ -162,7 +162,7 @@
android:layout_marginBottom="8dp"
android:layout_marginStart="7dp"
android:layout_marginTop="24dp"
android:fontFamily="@font/raleway_r"
android:fontFamily="@font/maax"
android:text="@string/amount"
android:textColor="@color/primary"
android:textSize="@dimen/text_size_medium"
@ -176,7 +176,7 @@
android:layout_height="wrap_content"
android:layout_marginBottom="1dp"
android:layout_marginStart="4dp"
android:fontFamily="@font/raleway_r"
android:fontFamily="@font/maax"
android:text="@string/including_fee"
android:textColor="@color/primary"
android:textSize="@dimen/text_size_1_small"
@ -186,14 +186,15 @@
<android.support.constraint.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:layout_marginLeft="8dp">
<EditText
android:id="@+id/etAmount"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:digits="0123456789.,"
android:fontFamily="@font/montserrat_light"
android:fontFamily="@font/maax"
android:hint="@string/enter_amount"
android:inputType="numberDecimal"
android:padding="12dp"
@ -203,7 +204,7 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintWidth_min="150dp"/>
app:layout_constraintWidth_min="150dp" />
<TextView
android:id="@+id/tvCurrency"
@ -211,12 +212,12 @@
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
android:layout_marginStart="8dp"
android:fontFamily="@font/montserrat_light"
android:fontFamily="@font/maax"
android:text="@string/m_btc"
android:textColor="@color/primary"
android:textSize="@dimen/text_size_large"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toRightOf="@+id/etAmount"/>
app:layout_constraintLeft_toRightOf="@+id/etAmount" />
</android.support.constraint.ConstraintLayout>
@ -226,10 +227,13 @@
android:id="@+id/btnVerify"
style="@style/AppTheme.RoundedCornerMaterialButton"
android:layout_width="match_parent"
android:layout_height="50dp"
android:layout_marginBottom="16dp"
android:fontFamily="@font/saira_condensed_bold"
android:text="@string/verify"
android:textSize="@dimen/text_size_large"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"/>
app:layout_constraintRight_toRightOf="parent" />
</android.support.constraint.ConstraintLayout>

8
app/src/main/res/layout/activity_purge.xml
View file

@ -15,7 +15,7 @@
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fontFamily="@font/raleway_r"
android:fontFamily="@font/maax"
android:text="@string/now_touch_the_banknote_with_id"
android:textAlignment="center"
android:textSize="@dimen/text_size_medium" />
@ -26,7 +26,7 @@
android:layout_height="wrap_content"
android:layout_marginBottom="10dp"
android:layout_marginTop="10dp"
android:fontFamily="@font/montserrat_light"
android:fontFamily="@font/maax"
android:textAlignment="center"
android:textColor="@color/black"
android:textSize="@dimen/text_size_large"
@ -35,7 +35,7 @@
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fontFamily="@font/raleway_r"
android:fontFamily="@font/maax"
android:text="@string/to_erase_the_wallet"
android:textAlignment="center"
android:textSize="@dimen/text_size_medium" />
@ -44,7 +44,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="20dp"
android:fontFamily="@font/raleway_r"
android:fontFamily="@font/maax"
android:text="@string/by_tapping_the_card"
android:textAlignment="center"
android:textColor="@android:color/holo_red_light"

24
app/src/main/res/layout/activity_request_pin.xml
View file

@ -44,7 +44,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center"
android:ems="10"
android:fontFamily="@font/raleway_el"
android:fontFamily="@font/maax"
android:text="@string/prompt_pin"
android:textAlignment="center"
android:textSize="@dimen/text_size_medium"/>
@ -69,7 +69,7 @@
android:layout_width="@dimen/pin_button_size"
android:layout_height="@dimen/pin_button_size"
android:layout_marginTop="8dp"
android:fontFamily="@font/montserrat_light"
android:fontFamily="@font/maax"
android:text="1"
android:textSize="@dimen/text_size_pin"/>
@ -79,7 +79,7 @@
android:layout_width="@dimen/pin_button_size"
android:layout_height="@dimen/pin_button_size"
android:layout_marginTop="@dimen/pin_button_top_margin"
android:fontFamily="@font/montserrat_light"
android:fontFamily="@font/maax"
android:text="2"
android:textSize="@dimen/text_size_pin"/>
@ -89,7 +89,7 @@
android:layout_width="@dimen/pin_button_size"
android:layout_height="@dimen/pin_button_size"
android:layout_marginTop="@dimen/pin_button_top_margin"
android:fontFamily="@font/montserrat_light"
android:fontFamily="@font/maax"
android:text="3"
android:textSize="@dimen/text_size_pin"/>
@ -99,7 +99,7 @@
android:layout_width="@dimen/pin_button_size"
android:layout_height="@dimen/pin_button_size"
android:layout_marginTop="@dimen/pin_button_top_margin"
android:fontFamily="@font/montserrat_light"
android:fontFamily="@font/maax"
android:text="4"
android:textSize="@dimen/text_size_pin"/>
@ -109,7 +109,7 @@
android:layout_width="@dimen/pin_button_size"
android:layout_height="@dimen/pin_button_size"
android:layout_marginTop="@dimen/pin_button_top_margin"
android:fontFamily="@font/montserrat_light"
android:fontFamily="@font/maax"
android:text="5"
android:textSize="@dimen/text_size_pin"/>
@ -119,7 +119,7 @@
android:layout_width="@dimen/pin_button_size"
android:layout_height="@dimen/pin_button_size"
android:layout_marginTop="@dimen/pin_button_top_margin"
android:fontFamily="@font/montserrat_light"
android:fontFamily="@font/maax"
android:text="6"
android:textSize="@dimen/text_size_pin"/>
@ -129,7 +129,7 @@
android:layout_width="@dimen/pin_button_size"
android:layout_height="@dimen/pin_button_size"
android:layout_marginTop="@dimen/pin_button_top_margin"
android:fontFamily="@font/montserrat_light"
android:fontFamily="@font/maax"
android:text="7"
android:textSize="@dimen/text_size_pin"/>
@ -139,7 +139,7 @@
android:layout_width="@dimen/pin_button_size"
android:layout_height="@dimen/pin_button_size"
android:layout_marginTop="@dimen/pin_button_top_margin"
android:fontFamily="@font/montserrat_light"
android:fontFamily="@font/maax"
android:text="8"
android:textSize="@dimen/text_size_pin"/>
@ -149,7 +149,7 @@
android:layout_width="@dimen/pin_button_size"
android:layout_height="@dimen/pin_button_size"
android:layout_marginTop="@dimen/pin_button_top_margin"
android:fontFamily="@font/montserrat_light"
android:fontFamily="@font/maax"
android:text="9"
android:textSize="@dimen/text_size_pin"/>
@ -161,7 +161,7 @@
android:layout_width="@dimen/pin_button_size"
android:layout_height="@dimen/pin_button_size"
android:layout_marginTop="@dimen/pin_button_top_margin"
android:fontFamily="@font/montserrat_light"
android:fontFamily="@font/maax"
android:text="0"
android:textSize="@dimen/text_size_pin"/>
@ -171,7 +171,7 @@
android:layout_width="@dimen/pin_button_size"
android:layout_height="@dimen/pin_button_size"
android:layout_marginTop="@dimen/pin_button_top_margin"
android:fontFamily="@font/montserrat_light"
android:fontFamily="@font/maax"
android:text="@string/pin_back"
android:textColor="@color/accent"
android:textSize="@dimen/text_size_pin"/>

24
app/src/main/res/layout/activity_save_pin.xml
View file

@ -30,7 +30,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:ems="10"
android:fontFamily="@font/raleway_el"
android:fontFamily="@font/maax"
android:paddingBottom="16dp"
android:paddingTop="16dp"
android:text="@string/enter_pin_and_use_fingerprint_to_save_it"
@ -54,7 +54,7 @@
android:layout_width="@dimen/pin_button_size"
android:layout_height="@dimen/pin_button_size"
android:layout_marginTop="@dimen/pin_button_top_margin"
android:fontFamily="@font/montserrat_light"
android:fontFamily="@font/maax"
android:text="1"
android:textSize="32dp"/>
@ -64,7 +64,7 @@
android:layout_width="@dimen/pin_button_size"
android:layout_height="@dimen/pin_button_size"
android:layout_marginTop="@dimen/pin_button_top_margin"
android:fontFamily="@font/montserrat_light"
android:fontFamily="@font/maax"
android:text="2"
android:textSize="32dp"/>
@ -74,7 +74,7 @@
android:layout_width="@dimen/pin_button_size"
android:layout_height="@dimen/pin_button_size"
android:layout_marginTop="@dimen/pin_button_top_margin"
android:fontFamily="@font/montserrat_light"
android:fontFamily="@font/maax"
android:text="3"
android:textSize="32dp"/>
@ -84,7 +84,7 @@
android:layout_width="@dimen/pin_button_size"
android:layout_height="@dimen/pin_button_size"
android:layout_marginTop="@dimen/pin_button_top_margin"
android:fontFamily="@font/montserrat_light"
android:fontFamily="@font/maax"
android:text="4"
android:textSize="32dp"/>
@ -94,7 +94,7 @@
android:layout_width="@dimen/pin_button_size"
android:layout_height="@dimen/pin_button_size"
android:layout_marginTop="@dimen/pin_button_top_margin"
android:fontFamily="@font/montserrat_light"
android:fontFamily="@font/maax"
android:text="5"
android:textSize="32dp"/>
@ -104,7 +104,7 @@
android:layout_width="@dimen/pin_button_size"
android:layout_height="@dimen/pin_button_size"
android:layout_marginTop="@dimen/pin_button_top_margin"
android:fontFamily="@font/montserrat_light"
android:fontFamily="@font/maax"
android:text="6"
android:textSize="32dp"/>
@ -114,7 +114,7 @@
android:layout_width="@dimen/pin_button_size"
android:layout_height="@dimen/pin_button_size"
android:layout_marginTop="@dimen/pin_button_top_margin"
android:fontFamily="@font/montserrat_light"
android:fontFamily="@font/maax"
android:text="7"
android:textSize="32dp"/>
@ -124,7 +124,7 @@
android:layout_width="@dimen/pin_button_size"
android:layout_height="@dimen/pin_button_size"
android:layout_marginTop="@dimen/pin_button_top_margin"
android:fontFamily="@font/montserrat_light"
android:fontFamily="@font/maax"
android:text="8"
android:textSize="32dp"/>
@ -134,7 +134,7 @@
android:layout_width="@dimen/pin_button_size"
android:layout_height="@dimen/pin_button_size"
android:layout_marginTop="@dimen/pin_button_top_margin"
android:fontFamily="@font/montserrat_light"
android:fontFamily="@font/maax"
android:text="9"
android:textSize="32dp"/>
@ -146,7 +146,7 @@
android:layout_width="@dimen/pin_button_size"
android:layout_height="@dimen/pin_button_size"
android:layout_marginTop="@dimen/pin_button_top_margin"
android:fontFamily="@font/montserrat_light"
android:fontFamily="@font/maax"
android:text="0"
android:textSize="32dp"/>
@ -156,7 +156,7 @@
android:layout_width="@dimen/pin_button_size"
android:layout_height="@dimen/pin_button_size"
android:layout_marginTop="@dimen/pin_button_top_margin"
android:fontFamily="@font/montserrat_light"
android:fontFamily="@font/maax"
android:text="&lt;"
android:textSize="32dp"/>

2
app/src/main/res/layout/activity_send_transaction.xml
View file

@ -34,7 +34,7 @@
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:fontFamily="@font/raleway_r"
android:fontFamily="@font/maax"
android:text="@string/please_wait"
android:textAlignment="center"
android:textSize="@dimen/text_size_medium"

6
app/src/main/res/layout/activity_sign_payment.xml
View file

@ -17,7 +17,7 @@
android:id="@+id/textView6"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fontFamily="@font/raleway_r"
android:fontFamily="@font/maax"
android:text="@string/now_touch_the_banknote_with_id"
android:textAlignment="center"
android:textSize="@dimen/text_size_medium"/>
@ -28,7 +28,7 @@
android:layout_height="wrap_content"
android:layout_marginBottom="10dp"
android:layout_marginTop="10dp"
android:fontFamily="@font/montserrat_light"
android:fontFamily="@font/maax"
android:textAlignment="center"
android:textColor="@color/black"
android:textSize="@dimen/text_size_large"
@ -38,7 +38,7 @@
android:id="@+id/textView7"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fontFamily="@font/raleway_r"
android:fontFamily="@font/maax"
android:text="@string/to_sign_the_payment"
android:textAlignment="center"
android:textSize="@dimen/text_size_medium"/>

6
app/src/main/res/layout/activity_swap_pin.xml
View file

@ -16,7 +16,7 @@
android:id="@+id/textView6"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fontFamily="@font/raleway_r"
android:fontFamily="@font/maax"
android:text="@string/now_touch_the_banknote_with_id"
android:textAlignment="center"
android:textSize="@dimen/text_size_medium"/>
@ -27,7 +27,7 @@
android:layout_height="wrap_content"
android:layout_marginBottom="10dp"
android:layout_marginTop="10dp"
android:fontFamily="@font/montserrat_light"
android:fontFamily="@font/maax"
android:textAlignment="center"
android:textColor="@color/black"
android:textSize="@dimen/text_size_large"
@ -37,7 +37,7 @@
android:id="@+id/textView7"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fontFamily="@font/raleway_r"
android:fontFamily="@font/maax"
android:text="@string/to_change_pin_codes"
android:textAlignment="center"
android:textSize="@dimen/text_size_medium"/>

6
app/src/main/res/layout/dialog_wait_pin2.xml
View file

@ -12,7 +12,7 @@
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="16dp"
android:fontFamily="@font/raleway_r"
android:fontFamily="@font/maax"
android:text="@string/this_banknote_has_enforced_security_delay"
android:textAlignment="center"
android:textColor="@color/primary"
@ -28,7 +28,7 @@
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="16dp"
android:fontFamily="@font/raleway_r"
android:fontFamily="@font/maax"
android:text="@string/please_hold_banknote"
android:textAlignment="center"
android:textColor="@color/black"
@ -62,7 +62,7 @@
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="16dp"
android:fontFamily="@font/raleway_r"
android:fontFamily="@font/maax"
android:text="@string/you_may_be_required_to_repeat"
android:textAlignment="center"
android:textColor="@color/primary"

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

@ -20,7 +20,8 @@
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent">
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="1.0">
<LinearLayout
android:layout_width="match_parent"
@ -109,9 +110,10 @@
<TextView
android:id="@+id/tvBlockchain"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_height="match_parent"
android:layout_weight="1"
android:fontFamily="@font/maax"
android:gravity="center_vertical"
android:textColor="@color/primary"
android:textStyle="normal|bold"
tools:text="Bitcoin" />
@ -135,6 +137,8 @@
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:fontFamily="@font/maax"
android:paddingEnd="5dp"
android:paddingStart="5dp"
android:textAlignment="center"
tools:text="Do not accept! Wallet verification field. Tap again." />
@ -167,14 +171,13 @@
android:textAlignment="center"
android:textColor="@android:color/black"
android:textSize="@dimen/text_size_1_small"
android:textStyle="normal|bold"
tools:text="1DoQdnSYshhZ5Tqt5Sk6svZt29jqoYVwQY" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="20dp"
android:gravity="center_vertical"
android:layout_marginTop="15dp"
android:gravity="center"
android:orientation="horizontal">
<ImageView
@ -186,7 +189,7 @@
<TextView
android:id="@+id/tvLookup"
android:layout_width="match_parent"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="@font/saira_condensed_bold"
android:paddingLeft="10dp"
@ -200,8 +203,8 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="10dp"
android:gravity="center_vertical"
android:layout_marginTop="15dp"
android:gravity="center"
android:orientation="horizontal">
<ImageView
@ -209,11 +212,12 @@
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:src="@drawable/ic_content_copy_black_24dp"
android:tint="@color/colorPrimary" />
<TextView
android:id="@+id/tvCopy"
android:layout_width="match_parent"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="@font/saira_condensed_bold"
android:paddingLeft="10dp"
@ -285,7 +289,7 @@
android:id="@+id/btnLoad"
style="@style/AppTheme.RoundedCornerMaterialButton"
android:layout_width="0dp"
android:layout_height="45dp"
android:layout_height="50dp"
android:layout_marginBottom="5dp"
android:layout_marginTop="5dp"
android:layout_weight="1"
@ -300,7 +304,7 @@
android:id="@+id/btnExtract"
style="@style/AppTheme.RoundedCornerMaterialButton"
android:layout_width="0dp"
android:layout_height="45dp"
android:layout_height="50dp"
android:layout_marginBottom="5dp"
android:layout_marginTop="5dp"
android:layout_weight="1"
@ -318,49 +322,63 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:paddingBottom="5dp"
android:paddingTop="5dp"
android:paddingTop="10dp"
app:layout_constraintBottom_toBottomOf="parent">
<android.support.design.widget.FloatingActionButton
android:id="@+id/fabInfo"
android:layout_width="wrap_content"
android:layout_height="30dp"
app:backgroundTint="@color/primary_dark"
app:fabSize="mini"
app:srcCompat="@drawable/ic_information_variant_white_24dp" />
<TextView
android:id="@+id/tvInfo"
android:layout_width="wrap_content"
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="20dp"
android:fontFamily="@font/saira_condensed_bold"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:text="@string/details"
android:textColor="@color/primary"
android:textSize="@dimen/text_size_medium" />
android:layout_weight="1"
android:gravity="center"
android:orientation="horizontal"
android:paddingBottom="10dp">
<android.support.design.widget.FloatingActionButton
android:id="@+id/fabNFC"
android:layout_width="wrap_content"
android:layout_height="30dp"
android:layout_marginStart="20dp"
app:backgroundTint="@color/primary_dark"
app:fabSize="mini"
app:srcCompat="@drawable/ic_nfc_white_24dp" />
<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/tvNFC"
android:layout_width="wrap_content"
<TextView
android:id="@+id/tvInfo"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="@font/saira_condensed_bold"
android:paddingLeft="10dp"
android:text="@string/details"
android:textColor="@color/primary"
android:textSize="@dimen/text_size_medium" />
</LinearLayout>
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:fontFamily="@font/saira_condensed_bold"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:text="@string/new_scan"
android:textColor="@color/primary"
android:textSize="@dimen/text_size_medium" />
android:layout_weight="1"
android:gravity="center"
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:fontFamily="@font/saira_condensed_bold"
android:paddingLeft="10dp"
android:text="@string/new_scan"
android:textColor="@color/primary"
android:textSize="@dimen/text_size_medium" />
</LinearLayout>
</LinearLayout>

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

@ -46,7 +46,7 @@
android:layout_alignParentTop="true"
android:layout_marginBottom="24dp"
android:layout_marginTop="8dp"
android:fontFamily="@font/raleway_r"
android:fontFamily="@font/maaxmedium"
android:text="@string/card_id"
android:textAlignment="center"
android:textSize="@dimen/text_size_medium" />
@ -59,7 +59,7 @@
android:layout_alignParentTop="true"
android:layout_marginBottom="4dp"
android:layout_marginTop="32dp"
android:fontFamily="@font/montserrat_light"
android:fontFamily="@font/maax"
android:text="@string/no_data_string_1"
android:textAlignment="center"
android:textColor="@color/primary_dark"
@ -84,7 +84,7 @@
<TextView
android:layout_width="@dimen/verify_card_left_col_width"
android:layout_height="wrap_content"
android:fontFamily="@font/raleway_r"
android:fontFamily="@font/maax"
android:text="@string/issuer"
android:textSize="@dimen/text_size_medium" />
@ -92,7 +92,7 @@
android:id="@+id/tvIssuer"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="@font/montserrat_light"
android:fontFamily="@font/maax"
android:text="@string/smart_cash_ag"
android:textColor="@color/primary_dark"
android:textSize="@dimen/text_size_medium"
@ -109,7 +109,7 @@
android:layout_width="@dimen/verify_card_left_col_width"
android:layout_height="wrap_content"
android:layout_marginStart="20dp"
android:fontFamily="@font/montserrat_light"
android:fontFamily="@font/maax"
android:text="@string/blockchain"
android:textSize="@dimen/text_size_1_small"
app:layout_constraintBottom_toBottomOf="parent"
@ -120,7 +120,7 @@
android:id="@+id/tvBlockchain"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="@font/montserrat_light"
android:fontFamily="@font/maax"
android:text="@string/blockchain"
android:textColor="@color/primary_dark"
android:textSize="@dimen/text_size_1_small"
@ -147,7 +147,7 @@
android:layout_width="@dimen/verify_card_left_col_width"
android:layout_height="wrap_content"
android:layout_marginStart="20dp"
android:fontFamily="@font/raleway_r"
android:fontFamily="@font/maax"
android:text="@string/signing_method"
android:textSize="@dimen/text_size_1_small" />
@ -155,7 +155,7 @@
android:id="@+id/tvSigningMethod"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="@font/montserrat_light"
android:fontFamily="@font/maax"
android:textColor="@color/primary_dark"
android:textSize="@dimen/text_size_1_small"
android:textStyle="normal|bold"
@ -172,7 +172,7 @@
android:layout_width="@dimen/verify_card_left_col_width"
android:layout_height="wrap_content"
android:layout_marginStart="20dp"
android:fontFamily="@font/raleway_r"
android:fontFamily="@font/maax"
android:text="@string/this_card_is"
android:textSize="@dimen/text_size_1_small" />
@ -180,7 +180,7 @@
android:id="@+id/tvReusable"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="@font/montserrat_light"
android:fontFamily="@font/maax"
android:textColor="@color/primary_dark"
android:textSize="@dimen/text_size_1_small"
android:textStyle="normal|bold"
@ -197,7 +197,7 @@
android:layout_width="@dimen/verify_card_left_col_width"
android:layout_height="wrap_content"
android:layout_marginStart="20dp"
android:fontFamily="@font/raleway_r"
android:fontFamily="@font/maax"
android:text="@string/signed_transactions"
android:textSize="@dimen/text_size_1_small" />
@ -205,7 +205,7 @@
android:id="@+id/tvSignedTx"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="@font/montserrat_light"
android:fontFamily="@font/maax"
android:textColor="@color/primary_dark"
android:textSize="@dimen/text_size_1_small"
android:textStyle="normal|bold"
@ -222,7 +222,7 @@
android:layout_width="@dimen/verify_card_left_col_width"
android:layout_height="wrap_content"
android:layout_marginStart="20dp"
android:fontFamily="@font/raleway_r"
android:fontFamily="@font/maax"
android:text="@string/remaining_signatures"
android:textSize="@dimen/text_size_1_small" />
@ -230,7 +230,7 @@
android:id="@+id/tvRemainingSignatures"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="@font/montserrat_light"
android:fontFamily="@font/maax"
android:textColor="@color/primary_dark"
android:textSize="@dimen/text_size_1_small"
android:textStyle="normal|bold"
@ -247,7 +247,7 @@
android:layout_width="@dimen/verify_card_left_col_width"
android:layout_height="wrap_content"
android:layout_marginStart="20dp"
android:fontFamily="@font/raleway_r"
android:fontFamily="@font/maax"
android:text="@string/time_of_last_signing"
android:textSize="@dimen/text_size_1_small" />
@ -255,7 +255,7 @@
android:id="@+id/tvLastSigned"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="@font/montserrat_light"
android:fontFamily="@font/maax"
android:text=""
android:textColor="@color/primary_dark"
android:textSize="@dimen/text_size_1_small"
@ -266,13 +266,14 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="horizontal">
<TextView
android:layout_width="@dimen/verify_card_left_col_width"
android:layout_height="wrap_content"
android:layout_marginStart="20dp"
android:fontFamily="@font/raleway_r"
android:fontFamily="@font/maax"
android:text="@string/features"
android:textSize="@dimen/text_size_1_small" />
@ -280,7 +281,7 @@
android:id="@+id/tvFeatures"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="@font/montserrat_light"
android:fontFamily="@font/maax"
android:textColor="@color/primary_dark"
android:textSize="@dimen/text_size_2_small"
android:textStyle="normal|bold"
@ -297,7 +298,7 @@
android:layout_width="@dimen/verify_card_left_col_width"
android:layout_height="wrap_content"
android:layout_marginStart="20dp"
android:fontFamily="@font/raleway_r"
android:fontFamily="@font/maax"
android:text="@string/issuer_data"
android:textSize="@dimen/text_size_1_small" />
@ -305,7 +306,7 @@
android:id="@+id/tvIssuerData"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="@font/montserrat_light"
android:fontFamily="@font/maax"
android:textColor="@color/primary_dark"
android:textSize="@dimen/text_size_1_small"
android:textStyle="normal|bold"
@ -330,7 +331,7 @@
<TextView
android:layout_width="@dimen/verify_card_left_col_width"
android:layout_height="wrap_content"
android:fontFamily="@font/raleway_r"
android:fontFamily="@font/maax"
android:text="@string/manufacturer"
android:textSize="@dimen/text_size_medium" />
@ -338,7 +339,7 @@
android:id="@+id/tvManufacturerInfo"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="@font/montserrat_light"
android:fontFamily="@font/maax"
android:text="@string/smart_cash_ag"
android:textColor="@color/primary_dark"
android:textSize="@dimen/text_size_medium"
@ -363,7 +364,7 @@
android:layout_width="@dimen/verify_card_left_col_width"
android:layout_height="wrap_content"
android:layout_marginStart="20dp"
android:fontFamily="@font/raleway_r"
android:fontFamily="@font/maax"
android:text="@string/card_identity"
android:textSize="@dimen/text_size_1_small" />
@ -371,7 +372,7 @@
android:id="@+id/tvCardIdentity"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="@font/montserrat_light"
android:fontFamily="@font/maax"
android:text="@string/attested"
android:textColor="@color/confirmed"
android:textSize="@dimen/text_size_1_small"
@ -388,7 +389,7 @@
android:layout_width="@dimen/verify_card_left_col_width"
android:layout_height="wrap_content"
android:layout_marginStart="20dp"
android:fontFamily="@font/raleway_r"
android:fontFamily="@font/maax"
android:text="@string/firmware"
android:textSize="@dimen/text_size_1_small" />
@ -396,7 +397,7 @@
android:id="@+id/tvFirmware"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="@font/montserrat_light"
android:fontFamily="@font/maax"
android:textColor="@color/primary_dark"
android:textSize="@dimen/text_size_1_small"
android:textStyle="normal|bold"
@ -412,7 +413,7 @@
android:layout_width="@dimen/verify_card_left_col_width"
android:layout_height="wrap_content"
android:layout_marginStart="20dp"
android:fontFamily="@font/raleway_r"
android:fontFamily="@font/maax"
android:text="@string/registration_date"
android:textSize="@dimen/text_size_1_small" />
@ -420,7 +421,7 @@
android:id="@+id/tvCardRegistredDate"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="@font/montserrat_light"
android:fontFamily="@font/maax"
android:textColor="@color/primary_dark"
android:textSize="@dimen/text_size_1_small"
android:textStyle="normal|bold"
@ -445,7 +446,7 @@
<TextView
android:layout_width="@dimen/verify_card_left_col_width"
android:layout_height="wrap_content"
android:fontFamily="@font/raleway_r"
android:fontFamily="@font/maax"
android:text="@string/wallet"
android:textSize="@dimen/text_size_medium" />
@ -453,10 +454,10 @@
android:id="@+id/tvWallet"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fontFamily="@font/montserrat_light"
android:fontFamily="@font/maax"
android:gravity="start|center_vertical"
android:textColor="@color/primary_dark"
android:textSize="@dimen/text_size_small"
android:textSize="@dimen/text_size_1_small"
android:textStyle="normal|bold"
tools:text="1DoQdnSYshhZ5Tqt5Sk6svZt29jqoYVwQY" />
@ -471,7 +472,7 @@
android:layout_width="@dimen/verify_card_left_col_width"
android:layout_height="wrap_content"
android:layout_marginStart="20dp"
android:fontFamily="@font/raleway_r"
android:fontFamily="@font/maax"
android:text="@string/private_key"
android:textSize="@dimen/text_size_1_small" />
@ -479,7 +480,7 @@
android:id="@+id/tvWalletIdentity"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="@font/montserrat_light"
android:fontFamily="@font/maax"
android:textColor="@color/confirmed"
android:textSize="@dimen/text_size_1_small"
android:textStyle="normal|bold"
@ -496,7 +497,7 @@
android:layout_width="@dimen/verify_card_left_col_width"
android:layout_height="wrap_content"
android:layout_marginStart="20dp"
android:fontFamily="@font/raleway_r"
android:fontFamily="@font/maax"
android:text="@string/validation_node"
android:textSize="@dimen/text_size_1_small" />
@ -504,7 +505,7 @@
android:id="@+id/tvValidationNode"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="@font/montserrat_light"
android:fontFamily="@font/maax"
android:textColor="@color/primary_dark"
android:textSize="@dimen/text_size_1_small"
android:textStyle="normal|bold"
@ -521,7 +522,7 @@
android:layout_width="@dimen/verify_card_left_col_width"
android:layout_height="wrap_content"
android:layout_marginStart="20dp"
android:fontFamily="@font/raleway_r"
android:fontFamily="@font/maax"
android:text="@string/unspents"
android:textSize="@dimen/text_size_1_small" />
@ -529,7 +530,7 @@
android:id="@+id/tvInputs"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="@font/montserrat_light"
android:fontFamily="@font/maax"
android:textColor="@color/primary_dark"
android:textSize="@dimen/text_size_1_small"
android:textStyle="normal|bold"
@ -542,7 +543,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/msg_okay"
android:fontFamily="@font/montserrat_light"
android:fontFamily="@font/maax"
android:padding="4dp"
android:shadowColor="@color/cardview_shadow_start_color"
android:shadowDx="2"
@ -558,7 +559,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/msg_err"
android:fontFamily="@font/montserrat_light"
android:fontFamily="@font/maax"
android:padding="4dp"
android:textAlignment="center"
android:textColor="@color/black"
@ -617,6 +618,7 @@
android:id="@+id/rlToolButtons"
android:layout_width="match_parent"
android:layout_height="0dp"
android:gravity="center_vertical"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent">
@ -633,8 +635,11 @@
android:id="@+id/btnOk"
style="@style/AppTheme.RoundedCornerMaterialButton"
android:layout_width="match_parent"
android:layout_height="50dp"
android:layout_margin="10dp"
android:text="@string/ok" />
android:fontFamily="@font/saira_condensed_bold"
android:text="@string/ok"
android:textSize="@dimen/text_size_large" />
</LinearLayout>

36
app/src/main/res/layout/item_list_card.xml
View file

@ -37,7 +37,7 @@
android:layout_height="match_parent"
android:layout_marginStart="20dp"
android:alpha="0.33"
android:fontFamily="@font/raleway_el"
android:fontFamily="@font/maax"
android:gravity="center"
android:rotation="-25"
android:textColor="@color/msg_err"
@ -63,7 +63,7 @@
android:layout_height="match_parent"
android:layout_marginStart="1dp"
android:alpha="0.6"
android:fontFamily="@font/raleway_el"
android:fontFamily="@font/maax"
android:gravity="bottom"
android:maxLines="1"
android:textColor="@color/black"
@ -104,7 +104,7 @@
android:layout_width="100dp"
android:layout_height="wrap_content"
android:layout_margin="0dp"
android:fontFamily="@font/raleway_r"
android:fontFamily="@font/maax"
android:text="@string/balance"
android:textColor="@color/primary_dark"
android:textSize="@dimen/text_size_large"/>
@ -114,7 +114,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="0dp"
android:fontFamily="@font/montserrat_light"
android:fontFamily="@font/maax"
android:textColor="@color/black"
android:textSize="@dimen/text_size_large"
android:textStyle="bold"
@ -134,7 +134,7 @@
android:layout_height="wrap_content"
android:layout_marginEnd="20dp"
android:background="@color/msg_okay"
android:fontFamily="@font/montserrat_light"
android:fontFamily="@font/maax"
android:text="@string/verified_offline"
android:textAlignment="center"
android:textColor="@color/white"
@ -147,7 +147,7 @@
android:layout_height="wrap_content"
android:layout_marginEnd="48dp"
android:layout_marginTop="2dp"
android:fontFamily="@font/montserrat_light"
android:fontFamily="@font/maax"
android:textColor="@color/black_overlay"
android:textSize="@dimen/text_size_1_small"
android:textStyle="normal|bold"
@ -164,7 +164,7 @@
<TextView
android:layout_width="110dp"
android:layout_height="wrap_content"
android:fontFamily="@font/raleway_r"
android:fontFamily="@font/maax"
android:text="@string/blockchain"
android:textColor="@color/primary_dark"
android:textSize="@dimen/text_size_1_small"/>
@ -174,7 +174,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:fontFamily="@font/montserrat_light"
android:fontFamily="@font/maax"
android:lines="1"
android:maxLines="1"
android:textColor="@color/primary_dark"
@ -192,7 +192,7 @@
<TextView
android:layout_width="110dp"
android:layout_height="wrap_content"
android:fontFamily="@font/raleway_r"
android:fontFamily="@font/maax"
android:text="@string/wallet"
android:textColor="@color/primary_dark"
android:textSize="@dimen/text_size_1_small"/>
@ -201,7 +201,7 @@
android:id="@+id/tvWallet"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="@font/montserrat_light"
android:fontFamily="@font/maax"
android:lines="1"
android:maxLines="1"
android:textColor="@color/primary_dark"
@ -220,7 +220,7 @@
android:id="@+id/lbLastInput"
android:layout_width="110dp"
android:layout_height="wrap_content"
android:fontFamily="@font/raleway_r"
android:fontFamily="@font/maax"
android:text="@string/last_unspent"
android:textColor="@color/primary_dark"
android:textSize="@dimen/text_size_1_small"/>
@ -229,7 +229,7 @@
android:id="@+id/tvLastInput"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="@font/montserrat_light"
android:fontFamily="@font/maax"
android:textColor="@color/primary_dark"
android:textSize="@dimen/text_size_small"
android:textStyle="normal|bold"/>
@ -245,7 +245,7 @@
android:id="@+id/lbLastOutput"
android:layout_width="110dp"
android:layout_height="wrap_content"
android:fontFamily="@font/raleway_r"
android:fontFamily="@font/maax"
android:text="@string/last_withdrawal"
android:textColor="@color/primary_dark"
android:textSize="@dimen/text_size_1_small"/>
@ -254,7 +254,7 @@
android:id="@+id/tvLastOutput"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="@font/montserrat_light"
android:fontFamily="@font/maax"
android:textColor="@color/primary_dark"
android:textSize="@dimen/text_size_small"
android:textStyle="normal|bold"/>
@ -273,7 +273,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center"
android:fontFamily="@font/raleway_r"
android:fontFamily="@font/maax"
android:gravity="center"
android:text="@string/no_wallet"
android:textAlignment="center"
@ -291,7 +291,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center"
android:fontFamily="@font/raleway_r"
android:fontFamily="@font/maax"
android:gravity="center"
android:text="@string/erased_wallet"
android:textAlignment="center"
@ -310,7 +310,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center"
android:fontFamily="@font/raleway_r"
android:fontFamily="@font/maax"
android:gravity="center"
android:text="@string/invalid_card"
android:textAlignment="center"
@ -330,7 +330,7 @@
android:clickable="true"
android:focusable="true"
android:focusableInTouchMode="true"
android:fontFamily="@font/montserrat_light"
android:fontFamily="@font/maax"
android:paddingTop="6dp"
android:textAlignment="center"
android:textColor="@color/primary_dark"

6
app/src/main/res/menu/menu_main.xml
View file

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<menu
xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:id="@+id/cleanCards"
android:title="@string/clean_up"/>
<!--<item-->
<!--android:id="@+id/cleanCards"-->
<!--android:title="@string/clean_up"/>-->
<item
android:id="@+id/managePIN"
android:enabled="false"

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

@ -34,7 +34,7 @@
<color name="type_banknote">#ffffff</color>
<color name="type_wallet">#ffffff</color>
<color name="black_overlay">#66000000</color>
<color name="confirmed">#106800</color>
<color name="confirmed">#00A818</color>
<color name="not_confirmed">#7c0a02</color>
<color name="bg_err">#600600</color>
<color name="bg_msg">#bff2af</color>

12
app/src/main/res/values/dimens.xml
View file

@ -17,12 +17,12 @@
<dimen name="empty_wallet_left_col_width">140dp</dimen>
<dimen name="empty_wallet_left_col_margin">16dp</dimen>
<dimen name="text_size_2_small">10sp</dimen>
<dimen name="text_size_small">12sp</dimen>
<dimen name="text_size_1_small">14sp</dimen>
<dimen name="text_size_medium">18sp</dimen>
<dimen name="text_size_large">24sp</dimen>
<dimen name="text_size_pin">32sp</dimen>
<dimen name="text_size_2_small">11sp</dimen>
<dimen name="text_size_small">13sp</dimen>
<dimen name="text_size_1_small">15sp</dimen>
<dimen name="text_size_medium">19sp</dimen>
<dimen name="text_size_large">26sp</dimen>
<dimen name="text_size_pin">34sp</dimen>
<dimen name="size_qr_image">200dp</dimen>
<dimen name="size_explore_image">30dp</dimen>

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

@ -55,7 +55,7 @@
<style name="AppTheme.RoundedCornerMaterialButton" parent="Widget.AppCompat.Button.Colored">
<item name="android:background">@drawable/rounded_shape</item>
<item name="android:fontFamily">@font/raleway_r</item>
<item name="android:fontFamily">@font/maax</item>
<item name="android:textColor">@color/white</item>
<item name="android:textSize">@dimen/text_size_medium</item>
<item name="android:textAlignment">center</item>