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-05-31 16:33:14 +03:00
parent 318be959b7
commit 99825905ab
19 changed files with 172 additions and 240 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
.idea/caches/build_file_checksums.ser generated
View file

Binary file not shown.

4
app/src/main/java/com/tangem/presentation/activity/CreateNewWalletActivity.java
View file

@ -44,12 +44,12 @@ public class CreateNewWalletActivity extends AppCompatActivity implements NfcAda
mCard = new TangemCard(getIntent().getStringExtra("UID"));
mCard.LoadFromBundle(getIntent().getExtras().getBundle("Card"));
tvCardID = (TextView) findViewById(R.id.tvCardID);
tvCardID = findViewById(R.id.tvCardID);
tvCardID.setText(mCard.getCIDDescription());
mNfcManager = new NfcManager(this, this);
progressBar = (ProgressBar) findViewById(R.id.progressBar);
progressBar = findViewById(R.id.progressBar);
progressBar.setProgressTintList(ColorStateList.valueOf(Color.DKGRAY));
progressBar.setVisibility(View.INVISIBLE);
}

32
app/src/main/java/com/tangem/presentation/activity/PreparePaymentActivity.java
View file

@ -31,14 +31,14 @@ public class PreparePaymentActivity extends AppCompatActivity implements NfcAdap
private static final int REQUEST_CODE_SCAN_QR = 1;
private static final int REQUEST_CODE_SEND_PAYMENT = 2;
Button btnVerify;
EditText etWallet;
EditText etAmount;
TextView tvCurrency;
TextView tvCardId, tvBalance, tvBalanceEquivalent, tvAmountEquivalent;
ImageView ivCamera;
private Button btnVerify;
private EditText etWallet;
private EditText etAmount;
private TextView tvCurrency;
private TextView tvCardId, tvBalance, tvBalanceEquivalent, tvAmountEquivalent;
private ImageView ivCamera;
boolean use_mCurrency;
TangemCard mCard;
private TangemCard mCard;
private NfcManager mNfcManager;
@Override
@ -53,15 +53,15 @@ public class PreparePaymentActivity extends AppCompatActivity implements NfcAdap
mCard = new TangemCard(getIntent().getStringExtra("UID"));
mCard.LoadFromBundle(getIntent().getExtras().getBundle("Card"));
btnVerify = (Button) findViewById(R.id.btnVerify);
etWallet = (EditText) findViewById(R.id.etWallet);
etAmount = (EditText) findViewById(R.id.etAmount);
ivCamera = (ImageView) findViewById(R.id.ivCamera);
tvCurrency = (TextView) findViewById(R.id.tvCurrency);
tvCardId = (TextView) findViewById(R.id.tvCardID);
tvBalance = (TextView) findViewById(R.id.tvBalance);
tvBalanceEquivalent = (TextView) findViewById(R.id.tvBalanceEquivalent);
tvAmountEquivalent = (TextView) findViewById(R.id.tvAmountEquivalent);
btnVerify = findViewById(R.id.btnVerify);
etWallet = findViewById(R.id.etWallet);
etAmount = findViewById(R.id.etAmount);
ivCamera = findViewById(R.id.ivCamera);
tvCurrency = findViewById(R.id.tvCurrency);
tvCardId = findViewById(R.id.tvCardID);
tvBalance = findViewById(R.id.tvBalance);
tvBalanceEquivalent = findViewById(R.id.tvBalanceEquivalent);
tvAmountEquivalent = findViewById(R.id.tvAmountEquivalent);
tvCardId.setText(mCard.getCIDDescription());
CoinEngine engine = CoinEngineFactory.Create(mCard.getBlockchain());

4
app/src/main/java/com/tangem/presentation/activity/PurgeActivity.java
View file

@ -45,12 +45,12 @@ public class PurgeActivity extends AppCompatActivity implements NfcAdapter.Reade
mCard = new TangemCard(getIntent().getStringExtra("UID"));
mCard.LoadFromBundle(getIntent().getExtras().getBundle("Card"));
tvCardID = (TextView) findViewById(R.id.tvCardID);
tvCardID = findViewById(R.id.tvCardID);
tvCardID.setText(mCard.getCIDDescription());
mNfcManager = new NfcManager(this, this);
progressBar = (ProgressBar) findViewById(R.id.progressBar);
progressBar = findViewById(R.id.progressBar);
progressBar.setProgressTintList(ColorStateList.valueOf(Color.DKGRAY));
progressBar.setVisibility(View.INVISIBLE);
}

18
app/src/main/res/layout/activity_card_info.xml
View file

@ -16,16 +16,6 @@
android:paddingTop="@dimen/appbar_padding_top"
android:theme="@style/AppTheme.AppBarOverlay">
<!--<android.support.v7.widget.Toolbar-->
<!--android:id="@+id/toolbar"-->
<!--android:layout_width="match_parent"-->
<!--android:layout_height="?attr/actionBarSize"-->
<!--android:background="?attr/colorPrimary"-->
<!--app:layout_scrollFlags="scroll|enterAlways"-->
<!--app:popupTheme="@style/AppTheme.PopupOverlay">-->
<!--</android.support.v7.widget.Toolbar>-->
<android.support.design.widget.TabLayout
android:id="@+id/tabs"
android:layout_width="match_parent"
@ -39,12 +29,4 @@
android:layout_height="match_parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior"/>
<!--<android.support.design.widget.FloatingActionButton-->
<!--android:id="@+id/fab"-->
<!--android:layout_width="wrap_content"-->
<!--android:layout_height="wrap_content"-->
<!--android:layout_gravity="end|bottom"-->
<!--android:layout_margin="@dimen/fab_margin"-->
<!--app:srcCompat="@android:drawable/ic_dialog_email" />-->
</android.support.design.widget.CoordinatorLayout>

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

@ -22,7 +22,6 @@
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent"/>
<LinearLayout
android:id="@+id/llPayment"
android:layout_width="match_parent"
@ -36,7 +35,6 @@
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -98,7 +96,6 @@
android:textSize="14dp"/>
</LinearLayout>
<android.support.constraint.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -128,7 +125,6 @@
android:layout_marginLeft="8dp"
android:layout_marginRight="8dp"
android:enabled="false"
android:fontFamily="@font/montserrat_light"
android:hint="target wallet address"
android:inputType="text"

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

@ -17,9 +17,9 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fontFamily="@font/raleway_r"
android:text="Now touch the banknote with ID"
android:text="@string/now_touch_the_banknote_with_id"
android:textAlignment="center"
android:textSize="@dimen/font_normal"/>
android:textSize="@dimen/text_size_medium"/>
<TextView
android:id="@+id/tvCardID"
@ -28,18 +28,19 @@
android:layout_marginBottom="10dp"
android:layout_marginTop="10dp"
android:fontFamily="@font/montserrat_light"
android:text=" "
android:textAlignment="center"
android:textColor="@color/black"
android:textSize="@dimen/font_large"/>
android:textSize="@dimen/text_size_large"
tools:text="3748378347"/>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fontFamily="@font/raleway_r"
android:text="to create the wallet"
android:text="@string/to_create_the_wallet"
android:textAlignment="center"
android:textSize="@dimen/font_normal"/>
android:textSize="@dimen/text_size_medium"/>
</LinearLayout>
<ProgressBar
@ -53,4 +54,4 @@
android:layout_marginRight="8dp"
app:layout_constraintBottom_toBottomOf="parent"/>
</RelativeLayout>
</RelativeLayout>

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

@ -23,11 +23,11 @@
android:layout_gravity="bottom"
android:fontFamily="@font/raleway_r"
android:gravity="center_horizontal"
android:text="BETA"
android:text="@string/beta"
android:textAlignment="center"
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
android:textColor="@android:color/holo_red_light"
android:textSize="12dp"/>
android:textSize="@dimen/text_size_small"/>
<TextView
android:id="@+id/textView9"
@ -38,9 +38,9 @@
android:layout_marginTop="24dp"
android:fontFamily="@font/raleway_el"
android:gravity="bottom"
android:text="Smart Cash AG"
android:text="@string/smart_cash_ag"
android:textAlignment="center"
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
android:textSize="12dp"/>
android:textSize="@dimen/text_size_small"/>
</LinearLayout>

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

@ -7,12 +7,6 @@
android:layout_height="match_parent"
tools:context="com.tangem.presentation.activity.MainActivity">
<!--<ImageView-->
<!--android:id="@+id/ivTap"-->
<!--android:layout_width="match_parent"-->
<!--android:layout_height="match_parent"-->
<!--app:srcCompat="@drawable/tap" />-->
<LinearLayout
android:id="@+id/tvTapPrompt"
android:layout_width="match_parent"
@ -30,6 +24,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="100dp"
android:layout_marginRight="100dp"
android:elevation="2dp"
android:gravity="center"
android:orientation="vertical">
@ -47,6 +42,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="100dp"
android:layout_marginRight="100dp"
android:elevation="1dp"
android:gravity="center"
android:orientation="vertical">
@ -55,10 +51,6 @@
android:id="@+id/imNFC"
android:layout_width="150dp"
android:layout_height="150dp"
android:layout_alignParentStart="false"
android:layout_alignParentTop="false"
android:layout_centerHorizontal="false"
android:layout_centerInParent="false"
app:rb_color="@color/fab"
app:rb_duration="3000"
app:rb_radius="16dp"
@ -84,6 +76,7 @@
android:layout_width="190dp"
android:layout_height="wrap_content"
app:srcCompat="@drawable/hand_card"/>
</LinearLayout>
</RelativeLayout>
@ -95,15 +88,14 @@
android:layout_marginLeft="24dp"
android:layout_marginRight="24dp"
android:layout_marginTop="24dp"
android:autoText="false"
android:fontFamily="@font/raleway_el"
android:gravity="top"
android:text="Tap Tangem card with your smartphone"
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="18dp"/>
android:textSize="@dimen/text_size_medium"/>
</LinearLayout>
@ -113,7 +105,6 @@
android:layout_width="match_parent"
android:layout_height="match_parent"/>
<FrameLayout
android:id="@+id/frameFAB"
android:layout_width="wrap_content"
@ -123,14 +114,6 @@
android:elevation="3dp"
android:visibility="visible">
<!--<android.support.design.widget.FloatingActionButton-->
<!--android:id="@+id/fab"-->
<!--android:layout_width="64dp"-->
<!--android:layout_height="64dp"-->
<!--android:layout_margin="8dp"-->
<!--android:src="@android:color/transparent"-->
<!--app:backgroundTint="@color/colorPrimary" />-->
<android.support.design.widget.FloatingActionButton
android:id="@+id/fab"
android:layout_width="64dp"
@ -139,15 +122,6 @@
android:src="@drawable/ic_show_menu"
app:backgroundTint="@color/colorPrimary"/>
<!--<TextView-->
<!--android:layout_width="wrap_content"-->
<!--android:layout_height="wrap_content"-->
<!--android:layout_gravity="center"-->
<!--android:elevation="16dp"-->
<!--android:fontFamily="@font/raleway_r"-->
<!--android:text="CLEAN"-->
<!--android:textAppearance="?android:attr/textAppearanceSmall"-->
<!--android:textColor="@android:color/white" />-->
</FrameLayout>
</android.support.design.widget.CoordinatorLayout>

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

@ -14,15 +14,14 @@
android:fontFamily="@font/raleway_r"
android:paddingBottom="8dp"
android:paddingTop="8dp"
android:text="Send payment"
android:text="@string/send_payment"
android:textAlignment="center"
android:textColor="@color/primary"
android:textSize="@dimen/font_large"
android:textSize="@dimen/text_size_large"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent"/>
<LinearLayout
android:id="@+id/llFrom"
android:layout_width="0dp"
@ -30,7 +29,8 @@
android:background="@color/btn_light"
android:orientation="vertical"
android:paddingBottom="24dp"
android:paddingLeft="8dp"
android:paddingEnd="8dp"
android:paddingStart="8dp"
android:paddingTop="24dp"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintLeft_toLeftOf="parent"
@ -40,34 +40,33 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="7dp"
android:layout_marginStart="7dp"
android:layout_marginTop="8dp"
android:fontFamily="@font/raleway_r"
android:text="From banknote"
android:text="@string/from_banknote"
android:textColor="@color/primary"
android:textSize="@dimen/font_normal"/>
android:textSize="@dimen/text_size_medium"/>
<TextView
android:id="@+id/tvCardID"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="16dp"
android:layout_marginStart="16dp"
android:layout_marginTop="4dp"
android:fontFamily="@font/montserrat_light"
android:text=" "
android:textColor="@color/black"
android:textSize="@dimen/font_normal"
android:textSize="@dimen/text_size_medium"
android:textStyle="bold"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="7dp"
android:layout_marginStart="7dp"
android:layout_marginTop="12dp"
android:fontFamily="@font/raleway_r"
android:text="with balance"
android:text="@string/with_balance"
android:textColor="@color/primary"
android:textSize="@dimen/font_normal"/>
android:textSize="@dimen/text_size_medium"/>
<LinearLayout
android:layout_width="wrap_content"
@ -79,24 +78,24 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="2dp"
android:layout_marginLeft="16dp"
android:layout_marginStart="16dp"
android:layout_marginTop="4dp"
android:fontFamily="@font/montserrat_light"
android:text=" "
android:textColor="@color/black"
android:textSize="@dimen/font_normal"
android:textStyle="bold"/>
android:textSize="@dimen/text_size_medium"
android:textStyle="bold"
tools:text="$232"/>
<TextView
android:id="@+id/tvBalanceEquivalent"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="12dp"
android:layout_marginStart="12dp"
android:layout_marginTop="4dp"
android:fontFamily="@font/montserrat_light"
android:text=" "
android:textColor="@android:color/darker_gray"
android:textSize="14dp"/>
android:textSize="@dimen/text_size_1_small"
tools:text="$132"/>
</LinearLayout>
@ -122,12 +121,12 @@
android:id="@+id/textView2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="4dp"
android:fontFamily="@font/raleway_r"
android:text="Send to wallet"
android:text="@string/send_to_wallet"
android:textColor="@color/primary"
android:textSize="@dimen/font_normal"
android:textSize="@dimen/text_size_medium"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent"/>
@ -136,26 +135,27 @@
android:id="@+id/ivCamera"
android:layout_width="32dp"
android:layout_height="32dp"
android:layout_marginLeft="12dp"
android:layout_marginStart="12dp"
android:src="@drawable/qr_scan"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent"/>
</LinearLayout>
<EditText
android:id="@+id/etWallet"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="8dp"
android:layout_marginStart="8dp"
android:fontFamily="@font/montserrat_light"
android:hint="enter wallet address"
android:hint="@string/enter_wallet_address"
android:inputType="text|textMultiLine|textNoSuggestions"
android:padding="12dp"
android:singleLine="false"
android:textColor="@color/colorPrimaryDark"
android:textColorLink="@android:color/holo_blue_dark"
android:textSize="18dp"
android:textSize="@dimen/text_size_medium"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toLeftOf="@+id/ivCamera"
tools:layout_editor_absoluteY="2dp"/>
@ -169,12 +169,12 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
android:layout_marginLeft="7dp"
android:layout_marginStart="7dp"
android:layout_marginTop="24dp"
android:fontFamily="@font/raleway_r"
android:text="Amount"
android:text="@string/amount"
android:textColor="@color/primary"
android:textSize="@dimen/font_normal"
android:textSize="@dimen/text_size_medium"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent"/>
@ -184,11 +184,11 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="1dp"
android:layout_marginLeft="4dp"
android:layout_marginStart="4dp"
android:fontFamily="@font/raleway_r"
android:text="(including fee)"
android:text="@string/including_fee"
android:textColor="@color/primary"
android:textSize="14dp"
android:textSize="@dimen/text_size_1_small"
app:layout_constraintBottom_toBottomOf="@+id/textView3"
app:layout_constraintLeft_toRightOf="@+id/textView3"/>
</android.support.constraint.ConstraintLayout>
@ -201,14 +201,13 @@
android:id="@+id/etAmount"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginLeft="8dp"
android:editable="false"
android:layout_marginStart="8dp"
android:fontFamily="@font/montserrat_light"
android:hint="enter amount"
android:hint="@string/enter_amount"
android:inputType="numberDecimal"
android:padding="12dp"
android:textColor="@color/colorPrimaryDark"
android:textSize="24dp"
android:textSize="@dimen/text_size_large"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
@ -220,11 +219,11 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
android:layout_marginLeft="8dp"
android:layout_marginStart="8dp"
android:fontFamily="@font/montserrat_light"
android:text="mBTC"
android:text="@string/m_btc"
android:textColor="@color/primary"
android:textSize="24dp"
android:textSize="@dimen/text_size_large"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toRightOf="@+id/etAmount"/>
@ -233,11 +232,10 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="4dp"
android:layout_marginLeft="8dp"
android:layout_marginStart="8dp"
android:fontFamily="@font/montserrat_light"
android:text=" "
android:textColor="@android:color/darker_gray"
android:textSize="14dp"
android:textSize="@dimen/text_size_1_small"
app:layout_constraintBottom_toBottomOf="@+id/tvCurrency"
app:layout_constraintLeft_toRightOf="@+id/tvCurrency"/>
@ -254,11 +252,11 @@
android:backgroundTint="@color/colorPrimary"
android:fontFamily="@font/raleway_r"
android:includeFontPadding="false"
android:text="Verify"
android:text="@string/verify"
android:textColor="@color/white"
android:textSize="@dimen/font_large"
android:textSize="@dimen/text_size_large"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"/>
</android.support.constraint.ConstraintLayout>
</android.support.constraint.ConstraintLayout>

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

@ -18,9 +18,9 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fontFamily="@font/raleway_r"
android:text="Now touch the banknote with ID"
android:text="@string/now_touch_the_banknote_with_id"
android:textAlignment="center"
android:textSize="@dimen/font_normal"/>
android:textSize="@dimen/text_size_medium"/>
<TextView
android:id="@+id/tvCardID"
@ -29,19 +29,19 @@
android:layout_marginBottom="10dp"
android:layout_marginTop="10dp"
android:fontFamily="@font/montserrat_light"
android:text=" "
android:textAlignment="center"
android:textColor="@color/black"
android:textSize="@dimen/font_large"/>
android:textSize="@dimen/text_size_large"
tools:text="3748378347"/>
<TextView
android:id="@+id/textView7"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fontFamily="@font/raleway_r"
android:text="to erase the wallet"
android:text="@string/to_erase_the_wallet"
android:textAlignment="center"
android:textSize="@dimen/font_normal"/>
android:textSize="@dimen/text_size_medium"/>
</LinearLayout>

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

@ -6,25 +6,6 @@
android:gravity="center_horizontal"
android:orientation="vertical"
tools:context="com.tangem.presentation.activity.RequestPINActivity">
<!--android:paddingBottom="@dimen/activity_vertical_margin"-->
<!--android:paddingLeft="@dimen/activity_horizontal_margin"-->
<!--android:paddingRight="@dimen/activity_horizontal_margin"-->
<!--android:paddingTop="@dimen/activity_vertical_margin"-->
<!-- Login progress -->
<!--<android.support.design.widget.AppBarLayout-->
<!--android:layout_width="match_parent"-->
<!--android:layout_height="wrap_content"-->
<!--android:theme="@style/AppTheme.AppBarOverlay">-->
<!--<android.support.v7.widget.Toolbar-->
<!--android:id="@+id/toolbar"-->
<!--android:layout_width="match_parent"-->
<!--android:layout_height="45dp"-->
<!--android:background="?attr/colorPrimary"-->
<!--app:popupTheme="@style/AppTheme.PopupOverlay" />-->
<!--</android.support.design.widget.AppBarLayout>-->
<LinearLayout
android:id="@+id/login_form"
@ -32,15 +13,6 @@
android:layout_height="match_parent"
android:orientation="vertical">
<!--<ImageView-->
<!--android:id="@+id/imageView"-->
<!--android:layout_width="match_parent"-->
<!--android:layout_height="80dp"-->
<!--android:background="?android:attr/colorPrimary"-->
<!--android:layout_margin="0dp"-->
<!--android:padding="0dp"-->
<!--android:src="@drawatangemdemo" />-->
<TextView
android:id="@+id/pin"
android:layout_width="match_parent"
@ -50,7 +22,8 @@
android:paddingBottom="16dp"
android:singleLine="false"
android:textAlignment="center"
android:textSize="36sp"/>
android:textSize="36sp"
tools:text="12345"/>
<LinearLayout
android:layout_width="match_parent"
@ -62,8 +35,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:background="@mipmap/ic_fp"
/>
android:background="@mipmap/ic_fp"/>
<TextView
android:id="@+id/pin_prompt"
@ -74,7 +46,8 @@
android:fontFamily="@font/raleway_el"
android:text="@string/prompt_pin"
android:textAlignment="center"
android:textSize="18dp"/>
android:textSize="@dimen/text_size_medium"/>
</LinearLayout>
@ -95,12 +68,10 @@
style="@android:style/Widget.DeviceDefault.Button.Borderless"
android:layout_width="@dimen/pin_button_size"
android:layout_height="@dimen/pin_button_size"
android:layout_alignParentTop="true"
android:layout_alignStart="@+id/gridLayout"
android:layout_marginTop="8dp"
android:fontFamily="@font/montserrat_light"
android:text="1"
android:textSize="32dp"/>
android:textSize="@dimen/text_size_pin"/>
<Button
android:id="@+id/btn2"
@ -110,7 +81,7 @@
android:layout_marginTop="@dimen/pin_button_top_margin"
android:fontFamily="@font/montserrat_light"
android:text="2"
android:textSize="32dp"/>
android:textSize="@dimen/text_size_pin"/>
<Button
android:id="@+id/btn3"
@ -120,7 +91,7 @@
android:layout_marginTop="@dimen/pin_button_top_margin"
android:fontFamily="@font/montserrat_light"
android:text="3"
android:textSize="32dp"/>
android:textSize="@dimen/text_size_pin"/>
<Button
android:id="@+id/btn4"
@ -130,7 +101,7 @@
android:layout_marginTop="@dimen/pin_button_top_margin"
android:fontFamily="@font/montserrat_light"
android:text="4"
android:textSize="32dp"/>
android:textSize="@dimen/text_size_pin"/>
<Button
android:id="@+id/btn5"
@ -140,7 +111,7 @@
android:layout_marginTop="@dimen/pin_button_top_margin"
android:fontFamily="@font/montserrat_light"
android:text="5"
android:textSize="32dp"/>
android:textSize="@dimen/text_size_pin"/>
<Button
android:id="@+id/btn6"
@ -150,7 +121,7 @@
android:layout_marginTop="@dimen/pin_button_top_margin"
android:fontFamily="@font/montserrat_light"
android:text="6"
android:textSize="32dp"/>
android:textSize="@dimen/text_size_pin"/>
<Button
android:id="@+id/btn7"
@ -160,7 +131,7 @@
android:layout_marginTop="@dimen/pin_button_top_margin"
android:fontFamily="@font/montserrat_light"
android:text="7"
android:textSize="32dp"/>
android:textSize="@dimen/text_size_pin"/>
<Button
android:id="@+id/btn8"
@ -170,7 +141,7 @@
android:layout_marginTop="@dimen/pin_button_top_margin"
android:fontFamily="@font/montserrat_light"
android:text="8"
android:textSize="32dp"/>
android:textSize="@dimen/text_size_pin"/>
<Button
android:id="@+id/btn9"
@ -180,7 +151,7 @@
android:layout_marginTop="@dimen/pin_button_top_margin"
android:fontFamily="@font/montserrat_light"
android:text="9"
android:textSize="32dp"/>
android:textSize="@dimen/text_size_pin"/>
<Space/>
@ -192,7 +163,7 @@
android:layout_marginTop="@dimen/pin_button_top_margin"
android:fontFamily="@font/montserrat_light"
android:text="0"
android:textSize="32dp"/>
android:textSize="@dimen/text_size_pin"/>
<Button
android:id="@+id/btnBackspace"
@ -201,9 +172,9 @@
android:layout_height="@dimen/pin_button_size"
android:layout_marginTop="@dimen/pin_button_top_margin"
android:fontFamily="@font/montserrat_light"
android:text="&lt;"
android:text="@string/pin_back"
android:textColor="@color/accent"
android:textSize="32dp"/>
android:textSize="@dimen/text_size_pin"/>
</GridLayout>
@ -217,21 +188,12 @@
android:layout_gravity="bottom"
android:background="@color/colorPrimary"
android:fontFamily="@font/raleway_r"
android:text="OK"
android:text="@string/ok"
android:textColor="@color/white"
android:textSize="@dimen/font_large"
android:textSize="@dimen/text_size_large"
android:textStyle="bold"/>
</RelativeLayout>
</LinearLayout>
<!--<ProgressBar-->
<!--android:id="@+id/login_progress"-->
<!--style="?android:attr/progressBarStyleLarge"-->
<!--android:layout_width="wrap_content"-->
<!--android:layout_height="wrap_content"-->
<!--android:layout_marginBottom="8dp"-->
<!--android:visibility="gone" />-->
</LinearLayout>

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

@ -6,25 +6,6 @@
android:gravity="center_horizontal"
android:orientation="vertical"
tools:context="com.tangem.presentation.activity.SavePINActivity">
<!--android:paddingBottom="@dimen/activity_vertical_margin"-->
<!--android:paddingLeft="@dimen/activity_horizontal_margin"-->
<!--android:paddingRight="@dimen/activity_horizontal_margin"-->
<!--android:paddingTop="@dimen/activity_vertical_margin"-->
<!-- Login progress -->
<!--<android.support.design.widget.AppBarLayout-->
<!--android:layout_width="match_parent"-->
<!--android:layout_height="wrap_content"-->
<!--android:theme="@style/AppTheme.AppBarOverlay">-->
<!--<android.support.v7.widget.Toolbar-->
<!--android:id="@+id/toolbar"-->
<!--android:layout_width="match_parent"-->
<!--android:layout_height="45dp"-->
<!--android:background="?attr/colorPrimary"-->
<!--app:popupTheme="@style/AppTheme.PopupOverlay" />-->
<!--</android.support.design.widget.AppBarLayout>-->
<LinearLayout
android:id="@+id/login_form"

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

@ -35,9 +35,9 @@
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:fontFamily="@font/raleway_r"
android:text="Please wait while the payment is sent..."
android:text="@string/please_wait"
android:textAlignment="center"
android:textSize="@dimen/font_normal"
android:textSize="@dimen/text_size_medium"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.507"

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

@ -18,9 +18,9 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fontFamily="@font/raleway_r"
android:text="Now touch the banknote with ID"
android:text="@string/now_touch_the_banknote_with_id"
android:textAlignment="center"
android:textSize="@dimen/font_normal"/>
android:textSize="@dimen/text_size_medium"/>
<TextView
android:id="@+id/tvCardID"
@ -29,19 +29,19 @@
android:layout_marginBottom="10dp"
android:layout_marginTop="10dp"
android:fontFamily="@font/montserrat_light"
android:text=" "
android:textAlignment="center"
android:textColor="@color/black"
android:textSize="@dimen/font_large"/>
android:textSize="@dimen/text_size_large"
tools:text="24234234"/>
<TextView
android:id="@+id/textView7"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fontFamily="@font/raleway_r"
android:text="to sign the payment"
android:text="@string/to_sign_the_payment"
android:textAlignment="center"
android:textSize="@dimen/font_normal"/>
android:textSize="@dimen/text_size_medium"/>
</LinearLayout>

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

@ -18,9 +18,9 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fontFamily="@font/raleway_r"
android:text="Now touch the banknote with ID"
android:text="@string/now_touch_the_banknote_with_id"
android:textAlignment="center"
android:textSize="@dimen/font_normal"/>
android:textSize="@dimen/text_size_medium"/>
<TextView
android:id="@+id/tvCardID"
@ -29,19 +29,19 @@
android:layout_marginBottom="10dp"
android:layout_marginTop="10dp"
android:fontFamily="@font/montserrat_light"
android:text=" "
tools:text="24234234"
android:textAlignment="center"
android:textColor="@color/black"
android:textSize="@dimen/font_large"/>
android:textSize="@dimen/text_size_large"/>
<TextView
android:id="@+id/textView7"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fontFamily="@font/raleway_r"
android:text="to change PIN/PIN2 codes"
android:text="@string/to_change_pin_codes"
android:textAlignment="center"
android:textSize="@dimen/font_normal"/>
android:textSize="@dimen/text_size_medium"/>
</LinearLayout>

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

@ -1,7 +1,9 @@
<resources>
<dimen name="font_small">12dp</dimen>
<dimen name="font_normal">18dp</dimen>
<dimen name="font_large">24dp</dimen>
<dimen name="font_small">12dp</dimen>
<dimen name="height_thin_separator">0.8dp</dimen>
<dimen name="margin_separator">4dp</dimen>
<dimen name="margin_window">8dp</dimen>
@ -25,13 +27,11 @@
<dimen name="empty_wallet_font_small">12dp</dimen>
<dimen name="empty_wallet_left_col_margin">16dp</dimen>
<!-- Per the design guidelines, navigation drawers should be between 240dp and 320dp:
https://developer.android.com/design/patterns/navigation-drawer.html -->
<!-- Elevation when button is pressed -->
<!-- Z translation to apply when button is pressed -->
<!-- Default insets (outer padding) around buttons -->
<!-- Default inner padding within buttons -->
<!-- Default insets (outer padding) around controls -->
<!-- Default inner padding within controls -->
<!-- Default rounded corner for controls -->
<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>
</resources>

45
app/src/main/res/values/strings.xml
View file

@ -1,5 +1,6 @@
<resources>
<string name="ok">OK</string>
<string name="wrong_tag_err">Not ISO tag!</string>
<string name="msgCardMustBeLoaded">Card must be loaded first!</string>
<string name="tag_lost_err">Tag lost!</string>
@ -15,7 +16,7 @@
<string name="section_format">Hello World from section: %1$d</string>
<string name="fingerprint_authenticate_success">Successfully authenticated!</string>
<string name="pin_save_success">Successfully saved!</string>
<string name="prompt_pin">Enter PIN or use fingerprint scanner</string>
<string name="pin_save_fail">Saving pin failed</string>
<string name="error_empty_pin">PIN is empty</string>
<string name="error_pin_confirmation_failed">Please enter the PIN for confirmation!</string>
@ -31,6 +32,45 @@
<string name="title_activity_settings_feature">Settings</string>
<!-- LogoActivity -->
<string name="beta">BETA</string>
<string name="smart_cash_ag">Smart Cash AG</string>
<!-- CreateNewWalletActivity, PurgeActivity, SignPaymentActivity -->
<string name="now_touch_the_banknote_with_id">Now touch the banknote with ID</string>
<string name="to_create_the_wallet">to create the wallet</string>
<string name="to_erase_the_wallet">to erase the wallet</string>
<string name="to_sign_the_payment">to sign the payment</string>
<string name="to_change_pin_codes">to change PIN/PIN2 codes</string>
<!-- MainActivity -->
<string name="tap_tangem_card">Tap Tangem card with your smartphone</string>
<!-- PreparePaymentActivity -->
<string name="send_payment">Send payment</string>
<string name="from_banknote">From banknote</string>
<string name="with_balance">with balance</string>
<string name="send_to_wallet">Send to wallet</string>
<string name="enter_wallet_address">enter wallet address</string>
<string name="amount">Amount</string>
<string name="including_fee">(including fee)</string>
<string name="enter_amount">enter amount</string>
<string name="m_btc">mBTC</string>
<string name="verify">Verify</string>
<!-- RequestPINActivity -->
<string name="prompt_pin">Enter PIN or use fingerprint scanner</string>
<!-- SendTransactionActivity -->
<string name="please_wait">Please wait while the payment is sent…</string>
<!-- Strings related to Settings -->
@ -97,12 +137,9 @@
<!-- Example settings for Notifications -->
<string name="pref_header_notifications">Notifications</string>
<string name="pref_title_new_message_notifications">New message notifications</string>
<string name="pref_title_ringtone">Ringtone</string>
<string name="pref_ringtone_silent">Silent</string>
<string name="pref_title_vibrate">Vibrate</string>
</resources>

1
app/src/main/res/values/strings_untranslatable.xml
View file

@ -6,5 +6,6 @@
<string name="err_msg_prefix">!!&#160;</string>
<string name="action_msg_prefix">--&#160;</string>
<string name="NoDataString">-- -- --</string>
<string name="pin_back">&lt;</string>
</resources>