Browse Source

fix $ format

duke
Denio 5 years ago
parent
commit
79528a4d63
  1. 2
      app/src/main/java/org/myhush/silentdragon/MainActivity.kt
  2. 8
      app/src/main/java/org/myhush/silentdragon/SendActivity.kt
  3. 4
      app/src/main/java/org/myhush/silentdragon/TxDetailsActivity.kt
  4. 2
      app/src/main/res/layout/content_send.xml
  5. 2
      app/src/main/res/layout/content_tx_details.xml

2
app/src/main/java/org/myhush/silentdragon/MainActivity.kt

@ -160,7 +160,7 @@ class MainActivity : AppCompatActivity(),
lblBalance.text = "Balance"
txtMainBalance.text = balText.substring(0, balText.length - 4) + " ${DataModel.mainResponseData?.tokenName} "
txtMainBalanceUSD.text = DecimalFormat("#,##0.00").format(bal * zPrice) + " $"
txtMainBalanceUSD.text = "$ " + DecimalFormat("#,##0.00").format(bal * zPrice)
// Enable the send and recieve buttons
bottomNav.menu.findItem(R.id.action_recieve).isEnabled = true

8
app/src/main/java/org/myhush/silentdragon/SendActivity.kt

@ -103,10 +103,10 @@ class SendActivity : AppCompatActivity() {
if (hush == null || zprice == null)
amountUSD.text = "0.0 $"
amountUSD.text = "$ 0.0"
else
amountUSD.text =
DecimalFormat("#.########").format(hush * zprice) + " $"
" $" + DecimalFormat("#.########").format(hush * zprice)
}
}
})
@ -246,7 +246,7 @@ class SendActivity : AppCompatActivity() {
amountHUSH.setText((DecimalFormat("#.########").format(amt) + "${DataModel.mainResponseData?.tokenName}"))
amountUSD.text =
DecimalFormat("#.########").format(amt) + "$"
"$" + DecimalFormat("#.########").format(amt)
}
private fun setAmount(amt: Double?) {
@ -256,7 +256,7 @@ class SendActivity : AppCompatActivity() {
amountUSD.text = "0.0 $"
else
amountUSD.text =
DecimalFormat("#.########").format(amt) + "$"
"$" + DecimalFormat("#.########").format(amt)
}

4
app/src/main/java/org/myhush/silentdragon/TxDetailsActivity.kt

@ -60,8 +60,8 @@ class TxDetailsActivity : AppCompatActivity() {
val amtStr = DecimalFormat("#0.0000####").format(amt)
txtAmtHush.text = " $amtStr ${DataModel.mainResponseData?.tokenName}"
txtAmtUSD.text = DecimalFormat("#,##0.00").format(
(amt) * (DataModel.mainResponseData?.zecprice ?: 0.0)) + "$"
txtAmtUSD.text = "$" + DecimalFormat("#,##0.00").format(
(amt) * (DataModel.mainResponseData?.zecprice ?: 0.0))
if (tx?.memo.isNullOrBlank()) {
layoutMemo.visibility = ConstraintLayout.GONE

2
app/src/main/res/layout/content_send.xml

@ -118,7 +118,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="16dp"
android:text="0.00 $"
android:text="$ 0.00"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"

2
app/src/main/res/layout/content_tx_details.xml

@ -122,7 +122,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView6" />
<TextView
android:text="45.23 $"
android:text="$ 45.23"
android:layout_width="0dp"
android:layout_height="wrap_content" android:id="@+id/txtAmtUSD"
android:layout_marginTop="8dp"

Loading…
Cancel
Save