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 2020-09-14 17:21:10 +03:00
parent de1b543054
commit 2064413949
4 changed files with 47 additions and 168 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/src/main/java/com/tangem/tap/features/send/ui/stateSubscribers/SendStateSubscriber.kt
View file

@ -177,7 +177,7 @@ class SendStateSubscriber(fragment: BaseStoreFragment) : FragmentStateSubscriber
.bold { append(receipt.willSentCrypto) }.append(" ")
.append(receipt.symbols.crypto).append(" ")
.append(getString(R.string.send_total_will_be_sent))
totalLayout.tvWillBeSentValue.update(willSent)
totalLayout.tvWillBeSentValue.update(willSent.toString())
}
ReceiptLayoutType.CRYPTO -> {
@ -197,7 +197,7 @@ class SendStateSubscriber(fragment: BaseStoreFragment) : FragmentStateSubscriber
append(" (fee: ${receipt.feeFiat} ")
append(receipt.symbols.fiat).append(")")
}
totalLayout.tvWillBeSentValue.update(willSent)
totalLayout.tvWillBeSentValue.update(willSent.toString())
}
ReceiptLayoutType.TOKEN_FIAT -> {
val receipt = state.tokenFiat ?: return
@ -219,7 +219,7 @@ class SendStateSubscriber(fragment: BaseStoreFragment) : FragmentStateSubscriber
append(receipt.willSentFeeCrypto).append(" ")
}
.append(mainLayout.context.getString(R.string.send_total_will_be_sent))
totalLayout.tvWillBeSentValue.update(willSent)
totalLayout.tvWillBeSentValue.update(willSent.toString())
}
ReceiptLayoutType.TOKEN_CRYPTO -> {
val receipt = state.tokenCrypto ?: return
@ -236,7 +236,7 @@ class SendStateSubscriber(fragment: BaseStoreFragment) : FragmentStateSubscriber
append(receipt.totalFiat).append(" ")
append(receipt.symbols.fiat)
}
totalTokenLayout.tvTotalTokenCryptoValue.update(willSent)
totalTokenLayout.tvTotalTokenCryptoValue.update(willSent.toString())
}
}
}

84
app/src/main/res/layout/layout_receipt_total.xml
View file

@ -28,60 +28,26 @@
android:textSize="20sp"
android:textStyle="bold" />
<TextSwitcher
<TextView
android:id="@+id/tvTotalValue"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end"
android:inAnimation="@anim/slide_in_right"
android:outAnimation="@android:anim/slide_out_right">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end"
android:textAllCaps="true"
android:textSize="20sp"
android:textStyle="bold"
tools:text="usd" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end"
android:textAllCaps="true"
android:textSize="20sp"
android:textStyle="bold"
tools:text="usd" />
</TextSwitcher>
android:textAllCaps="true"
android:textSize="20sp"
android:textStyle="bold"
tools:text="usd" />
</FrameLayout>
<TextSwitcher
<TextView
android:id="@+id/tvWillBeSentValue"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end"
android:inAnimation="@anim/slide_in_right"
android:outAnimation="@android:anim/slide_out_right">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end"
android:layout_marginTop="4dp"
android:text="@string/send_total_will_be_sent"
android:textColor="@color/darkGray1" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end"
android:layout_marginTop="4dp"
android:text="@string/send_total_will_be_sent"
android:textColor="@color/darkGray1" />
</TextSwitcher>
android:layout_marginTop="4dp"
android:text="@string/send_total_will_be_sent"
android:textColor="@color/darkGray1" />
</LinearLayout>
@ -101,36 +67,16 @@
android:textSize="14sp"
android:textStyle="bold" />
<TextSwitcher
<TextView
android:id="@+id/tvTotalTokenCryptoValue"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end"
android:inAnimation="@anim/slide_in_right"
android:outAnimation="@android:anim/slide_out_right">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end"
android:textAllCaps="true"
android:textColor="@color/darkGray1"
android:textSize="14sp"
android:textStyle="bold"
tools:text="usd" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end"
android:textAllCaps="true"
android:textColor="@color/darkGray1"
android:textSize="14sp"
android:textStyle="bold"
tools:text="usd" />
</TextSwitcher>
android:textAllCaps="true"
android:textColor="@color/darkGray1"
android:textSize="14sp"
android:textStyle="bold"
tools:text="usd" />
</FrameLayout>

64
app/src/main/res/layout/layout_send_amount.xml
View file

@ -62,67 +62,33 @@
</FrameLayout>
<TextSwitcher
<TextView
android:id="@+id/tvAmountCurrency"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end"
android:layout_marginTop="26dp"
android:layout_marginEnd="16dp"
android:inAnimation="@anim/slide_in_up"
android:outAnimation="@anim/slide_out_down"
android:drawablePadding="10dp"
android:fontFamily="sans-serif-light"
android:textAllCaps="true"
android:textColor="@color/blue"
android:textSize="32sp"
app:drawableEndCompat="@drawable/ic_arrows_up_down"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent">
app:layout_constraintTop_toTopOf="parent"
tools:text="USD" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end"
android:drawablePadding="10dp"
android:fontFamily="sans-serif-light"
android:textAllCaps="true"
android:textColor="@color/blue"
android:textSize="32sp"
app:drawableEndCompat="@drawable/ic_arrows_up_down"
tools:text="USD" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end"
android:drawablePadding="10dp"
android:fontFamily="sans-serif-light"
android:textAllCaps="true"
android:textColor="@color/blue"
android:textSize="32sp"
app:drawableEndCompat="@drawable/ic_arrows_up_down" />
</TextSwitcher>
<TextSwitcher
<TextView
android:id="@+id/tvBalance"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end"
android:layout_marginTop="8dp"
android:layout_marginEnd="16dp"
android:inAnimation="@anim/slide_in_right"
android:outAnimation="@android:anim/slide_out_right"
android:textColor="@color/darkGray1"
android:textSize="16sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/flAmountToSend">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end"
android:textColor="@color/darkGray1"
android:textSize="16sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end"
android:textColor="@color/darkGray1"
android:textSize="16sp" />
</TextSwitcher>
app:layout_constraintTop_toBottomOf="@+id/flAmountToSend" />
</androidx.constraintlayout.widget.ConstraintLayout>

59
app/src/main/res/layout/layout_send_receipt.xml
View file

@ -17,32 +17,16 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextSwitcher
<TextView
android:id="@+id/tvReceiptAmountValue"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:inAnimation="@anim/slide_in_right"
android:outAnimation="@android:anim/slide_out_right"
android:layout_gravity="end"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end"
android:textAllCaps="true"
android:textStyle="bold"
tools:text="75.00 usd" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end"
android:textAllCaps="true"
android:textStyle="bold"
tools:text="75.00 usd" />
</TextSwitcher>
app:layout_constraintTop_toTopOf="parent"
android:textAllCaps="true"
android:textStyle="bold"
tools:text="75.00 usd" />
<TextView
android:id="@+id/tvReceiptFee"
@ -55,34 +39,17 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tvReceiptAmount" />
<TextSwitcher
<TextView
android:id="@+id/tvReceiptFeeValue"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:inAnimation="@anim/slide_in_right"
android:outAnimation="@android:anim/slide_out_right"
android:layout_gravity="end"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@+id/tvReceiptFee">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end"
android:textAllCaps="true"
android:textColor="@color/darkGray1"
android:textStyle="bold"
tools:text="0.03 usd" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end"
android:textAllCaps="true"
android:textColor="@color/darkGray1"
android:textStyle="bold"
tools:text="0.03 usd" />
</TextSwitcher>
app:layout_constraintTop_toTopOf="@+id/tvReceiptFee"
android:textAllCaps="true"
android:textColor="@color/darkGray1"
android:textStyle="bold"
tools:text="0.03 usd" />
<View
android:id="@+id/delimiter"