Browse Source

Better display of amounts in BTC

chat
gilardh 5 years ago
parent
commit
7dfd45680c
  1. 11
      app/src/main/java/org/myhush/silentdragon/MainActivity.kt
  2. 22
      app/src/main/java/org/myhush/silentdragon/SendActivity.kt

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

@ -68,8 +68,15 @@ class MainActivity : AppCompatActivity(),
}
txtMainBalanceUSD.setOnClickListener {
Toast.makeText(applicationContext, "1 HUSH = ${DataModel.currencySymbols[DataModel.selectedCurrency]}${DecimalFormat("#.##")
if(DataModel.selectedCurrency == "BTC")
Toast.makeText(applicationContext, "1 HUSH = ${DataModel.currencySymbols[DataModel.selectedCurrency]}${DecimalFormat(" #,##0.00000000")
.format(DataModel.currencyValues[DataModel.selectedCurrency])}", Toast.LENGTH_LONG).show()
else(
Toast.makeText(applicationContext, "1 HUSH = ${DataModel.currencySymbols[DataModel.selectedCurrency]}${DecimalFormat("#,##0.00")
.format(DataModel.currencyValues[DataModel.selectedCurrency])}", Toast.LENGTH_LONG).show()
)
}
bottomNav.setOnNavigationItemSelectedListener {
@ -171,7 +178,7 @@ class MainActivity : AppCompatActivity(),
lblBalance.text = "Balance"
txtMainBalance.text = balText + " ${DataModel.mainResponseData?.tokenName} "
if(cur.length > 1)
if(cur == "BTC")
txtMainBalanceUSD.text = "${DataModel.currencySymbols[cur]} " + DecimalFormat("0.00000000").format(bal * price)
else
txtMainBalanceUSD.text = "${DataModel.currencySymbols[cur]} " + DecimalFormat("#,##0.00").format(bal * price)

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

@ -64,8 +64,14 @@ class SendActivity : AppCompatActivity() {
if (DataModel.currencyValues["USD"] == null)
ConnectionManager.initCurrencies()
amountUSD.text = "${DataModel.currencySymbols[DataModel.selectedCurrency]} 0.00"
textViewFee.text = "0.0001 HUSH"
if (DataModel.selectedCurrency == "BTC")
amountUSD.text = "${DataModel.currencySymbols[DataModel.selectedCurrency]} " + DecimalFormat("0.00000000").format(0)
else
{
amountUSD.text = "${DataModel.currencySymbols[DataModel.selectedCurrency]} " + DecimalFormat("0.00").format(0)
}
textViewFee.text = DecimalFormat("0.0000").format(0.0001) + " HUSH"
sendAddress.addTextChangedListener(object : TextWatcher {
override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
@ -113,9 +119,17 @@ class SendActivity : AppCompatActivity() {
}
if (hush == null || price == null)
amountUSD.text = "$symbol 0.0"
if (symbol == "BTC")
amountUSD.text = "$symbol " + DecimalFormat("0.00000000").format(0)
else {
amountUSD.text = "$symbol " + DecimalFormat("0.00").format(0)
}
else
amountUSD.text = "$symbol " + DecimalFormat("#,##0.00").format(hush * price)
if (symbol == "BTC")
amountUSD.text = "$symbol " + DecimalFormat("#,##0.00000000").format(hush * price)
else {
amountUSD.text = "$symbol " + DecimalFormat("#,##0.00").format(hush * price)
}
}
})

Loading…
Cancel
Save