diff --git a/app/src/main/java/com/tangem/presentation/adapter/CardListAdapter.java b/app/src/main/java/com/tangem/presentation/adapter/CardListAdapter.java index 6a0b3be3e7..5c541fe60e 100644 --- a/app/src/main/java/com/tangem/presentation/adapter/CardListAdapter.java +++ b/app/src/main/java/com/tangem/presentation/adapter/CardListAdapter.java @@ -361,7 +361,7 @@ public class CardListAdapter extends RecyclerView.Adapter - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/layout/content_loaded_wallet.xml b/app/src/main/res/layout/content_loaded_wallet.xml index 5ca011564d..6bb5cc077b 100644 --- a/app/src/main/res/layout/content_loaded_wallet.xml +++ b/app/src/main/res/layout/content_loaded_wallet.xml @@ -1,4 +1,5 @@ - + tools:layout="@layout/fr_loaded_wallet"/> diff --git a/app/src/main/res/layout/content_main.xml b/app/src/main/res/layout/content_main.xml index e4688584e7..4e5c340f77 100644 --- a/app/src/main/res/layout/content_main.xml +++ b/app/src/main/res/layout/content_main.xml @@ -1,4 +1,5 @@ - + tools:layout="@layout/fr_main"/> diff --git a/app/src/main/res/layout/content_verify_card.xml b/app/src/main/res/layout/content_verify_card.xml index b9c88b3ce6..e92506f4b4 100644 --- a/app/src/main/res/layout/content_verify_card.xml +++ b/app/src/main/res/layout/content_verify_card.xml @@ -1,4 +1,5 @@ - + tools:layout="@layout/fr_verify_card"/> diff --git a/app/src/main/res/layout/dialog_fingerprint_confirmation.xml b/app/src/main/res/layout/dialog_fingerprint_confirmation.xml index 83430bf091..79f1331575 100644 --- a/app/src/main/res/layout/dialog_fingerprint_confirmation.xml +++ b/app/src/main/res/layout/dialog_fingerprint_confirmation.xml @@ -1,30 +1,32 @@ - + + android:layout_marginTop="16dp" + android:src="@mipmap/ic_fp"/> + + android:textSize="@dimen/font_normal"/> + - + android:visibility="gone"/> \ No newline at end of file diff --git a/app/src/main/res/layout/dialog_wait_pin2.xml b/app/src/main/res/layout/dialog_wait_pin2.xml index 86a6afe838..8291a8e6ab 100644 --- a/app/src/main/res/layout/dialog_wait_pin2.xml +++ b/app/src/main/res/layout/dialog_wait_pin2.xml @@ -1,5 +1,6 @@ - + app:layout_constraintTop_toTopOf="parent"/> + app:layout_constraintTop_toBottomOf="@+id/tvHeader"/> + app:layout_constraintVertical_bias="0.0"/> + app:layout_constraintTop_toBottomOf="@+id/progressBar"/> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_loaded_wallet.xml b/app/src/main/res/layout/fr_loaded_wallet.xml similarity index 97% rename from app/src/main/res/layout/fragment_loaded_wallet.xml rename to app/src/main/res/layout/fr_loaded_wallet.xml index 24867d211b..1991e5e2de 100644 --- a/app/src/main/res/layout/fragment_loaded_wallet.xml +++ b/app/src/main/res/layout/fr_loaded_wallet.xml @@ -1,580 +1,580 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/fragment_main.xml b/app/src/main/res/layout/fr_main.xml similarity index 97% rename from app/src/main/res/layout/fragment_main.xml rename to app/src/main/res/layout/fr_main.xml index 63b939271b..f0d3648d62 100644 --- a/app/src/main/res/layout/fragment_main.xml +++ b/app/src/main/res/layout/fr_main.xml @@ -1,34 +1,34 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/fragment_verify_card.xml b/app/src/main/res/layout/fr_verify_card.xml similarity index 97% rename from app/src/main/res/layout/fragment_verify_card.xml rename to app/src/main/res/layout/fr_verify_card.xml index e565ca8726..effecd8e8e 100644 --- a/app/src/main/res/layout/fragment_verify_card.xml +++ b/app/src/main/res/layout/fr_verify_card.xml @@ -1,576 +1,576 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/fragment_wallet_history.xml b/app/src/main/res/layout/fr_wallet_history.xml similarity index 97% rename from app/src/main/res/layout/fragment_wallet_history.xml rename to app/src/main/res/layout/fr_wallet_history.xml index dda13997ec..80cadbef05 100644 --- a/app/src/main/res/layout/fragment_wallet_history.xml +++ b/app/src/main/res/layout/fr_wallet_history.xml @@ -1,24 +1,24 @@ - - - - - - - - - + + + + + + + + + diff --git a/app/src/main/res/layout/fragment_wallet_info.xml b/app/src/main/res/layout/fr_wallet_info.xml similarity index 97% rename from app/src/main/res/layout/fragment_wallet_info.xml rename to app/src/main/res/layout/fr_wallet_info.xml index 458e4020a0..535fea1ae0 100644 --- a/app/src/main/res/layout/fragment_wallet_info.xml +++ b/app/src/main/res/layout/fr_wallet_info.xml @@ -1,44 +1,44 @@ - - - - - - + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_wallet_unspent.xml b/app/src/main/res/layout/fr_wallet_unspent.xml similarity index 97% rename from app/src/main/res/layout/fragment_wallet_unspent.xml rename to app/src/main/res/layout/fr_wallet_unspent.xml index c7c09a8538..5a926fd883 100644 --- a/app/src/main/res/layout/fragment_wallet_unspent.xml +++ b/app/src/main/res/layout/fr_wallet_unspent.xml @@ -1,24 +1,24 @@ - - - - - - - - - + + + + + + + + + diff --git a/app/src/main/res/layout/blockchain_list_item.xml b/app/src/main/res/layout/item_list_blockchain.xml similarity index 97% rename from app/src/main/res/layout/blockchain_list_item.xml rename to app/src/main/res/layout/item_list_blockchain.xml index 72798521ee..fc3c158ee9 100644 --- a/app/src/main/res/layout/blockchain_list_item.xml +++ b/app/src/main/res/layout/item_list_blockchain.xml @@ -1,23 +1,23 @@ - - - - - - - - + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_list_card.xml b/app/src/main/res/layout/item_list_card.xml new file mode 100644 index 0000000000..6b7f093cf0 --- /dev/null +++ b/app/src/main/res/layout/item_list_card.xml @@ -0,0 +1,359 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/card_history_list_item.xml b/app/src/main/res/layout/item_list_card_history.xml similarity index 70% rename from app/src/main/res/layout/card_history_list_item.xml rename to app/src/main/res/layout/item_list_card_history.xml index 380162ee78..ef2fc8f0e5 100644 --- a/app/src/main/res/layout/card_history_list_item.xml +++ b/app/src/main/res/layout/item_list_card_history.xml @@ -1,23 +1,22 @@ - - - - - - - - - - - + + + + + + + + + + + diff --git a/app/src/main/res/layout/card_unspent_list_item.xml b/app/src/main/res/layout/item_list_card_unspent.xml similarity index 70% rename from app/src/main/res/layout/card_unspent_list_item.xml rename to app/src/main/res/layout/item_list_card_unspent.xml index 52ae2f2581..90651efb76 100644 --- a/app/src/main/res/layout/card_unspent_list_item.xml +++ b/app/src/main/res/layout/item_list_card_unspent.xml @@ -1,23 +1,22 @@ - - - - - - - - - - - + + + + + + + + + + + diff --git a/app/src/main/res/layout/message_list_item.xml b/app/src/main/res/layout/item_list_message.xml similarity index 56% rename from app/src/main/res/layout/message_list_item.xml rename to app/src/main/res/layout/item_list_message.xml index 99070e386c..6f75258ba3 100644 --- a/app/src/main/res/layout/message_list_item.xml +++ b/app/src/main/res/layout/item_list_message.xml @@ -1,20 +1,21 @@ - - - - -