Updated on 2026-08-14
This commit is contained in:
parent
f7a711fc7b
commit
f6c5eb6828
7 changed files with 32 additions and 29 deletions
|
|
@ -126,15 +126,15 @@ public class PurgeActivity extends AppCompatActivity implements NfcAdapter.Reade
|
||||||
|
|
||||||
MainActivity.commonInit(getApplicationContext());
|
MainActivity.commonInit(getApplicationContext());
|
||||||
|
|
||||||
|
mCard = new TangemCard(getIntent().getStringExtra("UID"));
|
||||||
|
mCard.LoadFromBundle(getIntent().getExtras().getBundle("Card"));
|
||||||
|
|
||||||
TextView tvCardID = findViewById(R.id.tvCardID);
|
TextView tvCardID = findViewById(R.id.tvCardID);
|
||||||
progressBar = findViewById(R.id.progressBar);
|
progressBar = findViewById(R.id.progressBar);
|
||||||
|
|
||||||
tvCardID.setText(mCard.getCIDDescription());
|
tvCardID.setText(mCard.getCIDDescription());
|
||||||
progressBar.setProgressTintList(ColorStateList.valueOf(Color.DKGRAY));
|
progressBar.setProgressTintList(ColorStateList.valueOf(Color.DKGRAY));
|
||||||
progressBar.setVisibility(View.INVISIBLE);
|
progressBar.setVisibility(View.INVISIBLE);
|
||||||
|
|
||||||
mCard = new TangemCard(getIntent().getStringExtra("UID"));
|
|
||||||
mCard.LoadFromBundle(getIntent().getExtras().getBundle("Card"));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,6 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<RelativeLayout
|
<RelativeLayout
|
||||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
|
||||||
xmlns:tools="http://schemas.android.com/tools"
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
|
|
@ -43,15 +42,6 @@
|
||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
<ProgressBar
|
<include layout="@layout/layout_progress_horizontal"/>
|
||||||
android:id="@+id/progressBar"
|
|
||||||
style="@style/Widget.AppCompat.ProgressBar.Horizontal"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="16dp"
|
|
||||||
android:layout_alignParentBottom="true"
|
|
||||||
android:layout_marginBottom="6dp"
|
|
||||||
android:layout_marginLeft="8dp"
|
|
||||||
android:layout_marginRight="8dp"
|
|
||||||
app:layout_constraintBottom_toBottomOf="parent"/>
|
|
||||||
|
|
||||||
</RelativeLayout>
|
</RelativeLayout>
|
||||||
|
|
@ -14,7 +14,6 @@
|
||||||
android:orientation="vertical">
|
android:orientation="vertical">
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/textView6"
|
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:fontFamily="@font/raleway_r"
|
android:fontFamily="@font/raleway_r"
|
||||||
|
|
@ -32,10 +31,9 @@
|
||||||
android:textAlignment="center"
|
android:textAlignment="center"
|
||||||
android:textColor="@color/black"
|
android:textColor="@color/black"
|
||||||
android:textSize="@dimen/text_size_large"
|
android:textSize="@dimen/text_size_large"
|
||||||
tools:text="3748378347"/>
|
tools:text="CB02 0000 0002 5000"/>
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/textView7"
|
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:fontFamily="@font/raleway_r"
|
android:fontFamily="@font/raleway_r"
|
||||||
|
|
@ -43,6 +41,16 @@
|
||||||
android:textAlignment="center"
|
android:textAlignment="center"
|
||||||
android:textSize="@dimen/text_size_medium"/>
|
android:textSize="@dimen/text_size_medium"/>
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_margin="20dp"
|
||||||
|
android:fontFamily="@font/raleway_r"
|
||||||
|
android:text="@string/by_tapping_the_card"
|
||||||
|
android:textAlignment="center"
|
||||||
|
android:textColor="@android:color/holo_red_light"
|
||||||
|
android:textSize="@dimen/text_size_medium"/>
|
||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
<ProgressBar
|
<ProgressBar
|
||||||
|
|
|
||||||
|
|
@ -47,7 +47,6 @@
|
||||||
android:text="@string/prompt_pin"
|
android:text="@string/prompt_pin"
|
||||||
android:textAlignment="center"
|
android:textAlignment="center"
|
||||||
android:textSize="@dimen/text_size_medium"/>
|
android:textSize="@dimen/text_size_medium"/>
|
||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,6 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<RelativeLayout
|
<RelativeLayout
|
||||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
|
||||||
xmlns:tools="http://schemas.android.com/tools"
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
|
|
@ -29,10 +28,10 @@
|
||||||
android:layout_marginBottom="10dp"
|
android:layout_marginBottom="10dp"
|
||||||
android:layout_marginTop="10dp"
|
android:layout_marginTop="10dp"
|
||||||
android:fontFamily="@font/montserrat_light"
|
android:fontFamily="@font/montserrat_light"
|
||||||
tools:text="24234234"
|
|
||||||
android:textAlignment="center"
|
android:textAlignment="center"
|
||||||
android:textColor="@color/black"
|
android:textColor="@color/black"
|
||||||
android:textSize="@dimen/text_size_large"/>
|
android:textSize="@dimen/text_size_large"
|
||||||
|
tools:text="24234234"/>
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/textView7"
|
android:id="@+id/textView7"
|
||||||
|
|
@ -45,13 +44,6 @@
|
||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
<ProgressBar
|
<include layout="@layout/layout_progress_horizontal"/>
|
||||||
android:id="@+id/progressBar"
|
|
||||||
style="@style/Widget.AppCompat.ProgressBar.Horizontal"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="16dp"
|
|
||||||
android:layout_alignParentBottom="true"
|
|
||||||
android:elevation="1dp"
|
|
||||||
app:layout_constraintBottom_toBottomOf="parent"/>
|
|
||||||
|
|
||||||
</RelativeLayout>
|
</RelativeLayout>
|
||||||
13
app/src/main/res/layout/layout_progress_horizontal.xml
Normal file
13
app/src/main/res/layout/layout_progress_horizontal.xml
Normal file
|
|
@ -0,0 +1,13 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<ProgressBar
|
||||||
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||||
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
|
android:id="@+id/progressBar"
|
||||||
|
style="@style/Widget.AppCompat.ProgressBar.Horizontal"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="16dp"
|
||||||
|
android:layout_alignParentBottom="true"
|
||||||
|
android:elevation="1dp"
|
||||||
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
|
tools:showIn="@layout/activity_swap_pin"/>
|
||||||
|
|
@ -119,6 +119,7 @@
|
||||||
<string name="to_erase_the_wallet">to erase 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_sign_the_payment">to sign the payment</string>
|
||||||
<string name="to_change_pin_codes">to change PIN/PIN2 codes</string>
|
<string name="to_change_pin_codes">to change PIN/PIN2 codes</string>
|
||||||
|
<string name="by_tapping_the_card">By tapping the card, you will permanently remove the blockchain wallet. Ensure there will be no further incoming transactions</string>
|
||||||
|
|
||||||
<!-- PreparePaymentActivity -->
|
<!-- PreparePaymentActivity -->
|
||||||
<string name="send_payment">Send payment</string>
|
<string name="send_payment">Send payment</string>
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue