diff --git a/app/src/main/java/com/tangem/tap/features/wallet/ui/PendingTransactionsAdapter.kt b/app/src/main/java/com/tangem/tap/features/wallet/ui/PendingTransactionsAdapter.kt index 45abe6a80e..7602ecd237 100644 --- a/app/src/main/java/com/tangem/tap/features/wallet/ui/PendingTransactionsAdapter.kt +++ b/app/src/main/java/com/tangem/tap/features/wallet/ui/PendingTransactionsAdapter.kt @@ -49,8 +49,8 @@ class PendingTransactionsAdapter PendingTransactionType.Outcoming -> R.string.wallet_pending_transaction_outcoming_address } val image = when (transaction.type) { - PendingTransactionType.Incoming -> R.drawable.ic_arrow_down - PendingTransactionType.Outcoming -> R.drawable.ic_arrow_right + PendingTransactionType.Incoming -> R.drawable.ic_arrow_left + PendingTransactionType.Outcoming -> R.drawable.ic_arrow_right_20 } view.tv_pending_transaction.text = view.context.getString(transactionDescriptionRes) diff --git a/app/src/main/res/drawable/ic_arrow_left.xml b/app/src/main/res/drawable/ic_arrow_left.xml new file mode 100644 index 0000000000..c9d25ccc99 --- /dev/null +++ b/app/src/main/res/drawable/ic_arrow_left.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_arrow_right_20.xml b/app/src/main/res/drawable/ic_arrow_right_20.xml new file mode 100644 index 0000000000..b10fdaf7c6 --- /dev/null +++ b/app/src/main/res/drawable/ic_arrow_right_20.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_settings.xml b/app/src/main/res/drawable/ic_settings.xml new file mode 100644 index 0000000000..41a82ede8b --- /dev/null +++ b/app/src/main/res/drawable/ic_settings.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/layout/fragment_wallet.xml b/app/src/main/res/layout/fragment_wallet.xml index 17b4723d89..367050f06d 100644 --- a/app/src/main/res/layout/fragment_wallet.xml +++ b/app/src/main/res/layout/fragment_wallet.xml @@ -56,7 +56,7 @@ android:layout_marginEnd="16dp" android:layout_marginBottom="12dp" android:adjustViewBounds="true" - android:elevation="4dp" + android:elevation="3dp" android:scaleType="fitCenter" android:src="@drawable/card_placeholder" app:layout_constraintTop_toTopOf="parent" /> diff --git a/app/src/main/res/layout/item_pending_transaction.xml b/app/src/main/res/layout/item_pending_transaction.xml index b52b5dbe8e..abdaa514cf 100644 --- a/app/src/main/res/layout/item_pending_transaction.xml +++ b/app/src/main/res/layout/item_pending_transaction.xml @@ -9,49 +9,49 @@ android:id="@+id/card_pending_transaction" android:layout_width="match_parent" android:layout_height="36dp" - android:background="@android:color/white" android:layout_marginStart="16dp" - android:layout_marginEnd="16dp" android:layout_marginTop="2dp" + android:layout_marginEnd="16dp" android:layout_marginBottom="2dp" + android:background="@android:color/white" android:elevation="3dp"> + android:paddingEnd="16dp"> - + android:src="@drawable/ic_arrow_left" /> + + android:textSize="13sp" + tools:text="Receiving " /> + android:textSize="13sp" + android:textStyle="bold" + tools:text="0.001 " /> + android:textSize="13sp" + android:textStyle="bold" + tools:text="BTS" /> + android:singleLine="true" + android:textSize="13sp" + tools:text=" from 0x4313bcd3425235bda1232141" /> diff --git a/app/src/main/res/layout/layout_balance.xml b/app/src/main/res/layout/layout_balance.xml index d1cf9ff3ad..1931632965 100644 --- a/app/src/main/res/layout/layout_balance.xml +++ b/app/src/main/res/layout/layout_balance.xml @@ -91,12 +91,11 @@ diff --git a/app/src/main/res/menu/wallet.xml b/app/src/main/res/menu/wallet.xml index 0f6a7ccd07..42b5aa07c6 100644 --- a/app/src/main/res/menu/wallet.xml +++ b/app/src/main/res/menu/wallet.xml @@ -4,5 +4,6 @@ + android:icon="@drawable/ic_settings" + app:showAsAction="ifRoom" /> \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 5a63464c76..f9600d0a21 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -35,7 +35,7 @@ Create PayID Verified Balance Blockchain is unreachable - Transaction in progress + Transaction is in progress Your Tangem card was made to work with a different application. Please see the name and instructions on your card, and install the correct app. Uh oh! Balance is loading…