Browse Source

Maximum 2 decimals for amounts in $ and formatting

chat
gilardh 5 years ago
parent
commit
8611b38c84
  1. 2
      app/src/main/java/org/myhush/silentdragon/MainActivity.kt
  2. 10
      app/src/main/java/org/myhush/silentdragon/SendActivity.kt
  3. 2
      app/src/main/java/org/myhush/silentdragon/TxDetailsActivity.kt

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

@ -160,7 +160,7 @@ class MainActivity : AppCompatActivity(),
lblBalance.text = "Balance"
txtMainBalance.text = balText + " ${DataModel.mainResponseData?.tokenName} "
//txtMainBalance.text = balText.substring(0, balText.length - 8) + " ${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

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

@ -106,8 +106,7 @@ class SendActivity : AppCompatActivity() {
if (hush == null || zprice == null)
amountUSD.text = "$0.0"
else
amountUSD.text =
"$" + DecimalFormat("#.########").format(hush * zprice)
amountUSD.text = "$" + DecimalFormat("###,###,##0.00").format(hush * zprice)
}
}
})
@ -246,8 +245,7 @@ class SendActivity : AppCompatActivity() {
val zprice = DataModel.mainResponseData?.zecprice ?: 0.0
amountHUSH.setText((DecimalFormat("#.########").format(amt) + "${DataModel.mainResponseData?.tokenName}"))
amountUSD.text =
"$" + DecimalFormat("#.########").format(amt)
amountUSD.text = "$" + DecimalFormat("###,###,##0.00").format(amt)
}
private fun setAmount(amt: Double?) {
@ -256,9 +254,7 @@ class SendActivity : AppCompatActivity() {
if (amt == null || zprice == null)
amountUSD.text = "$0.0"
else
amountUSD.text =
"$" + DecimalFormat("#.########").format(amt)
amountUSD.text = "$" + DecimalFormat("###,###,##0.00").format(amt)
}
override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {

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

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

Loading…
Cancel
Save