Git-Mirrors/mollyim-monero-wallet-sdk
1
0
Fork 0
mirror of https://github.com/mollyim/monero-wallet-sdk.git synced 2024-10-01 03:45:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

lib: improve amount parsing and formating

Browse Source
This commit is contained in:
Oscar Mira 2024-03-03 12:43:47 +01:00
parent 5d8abc45c3
commit da50496271
2 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/android/src/main/kotlin/im/molly/monero/MoneroAmount.kt
View File

@ -18,6 +18,8 @@ value class MoneroAmount(val atomicUnits: Long) : Parcelable {
val xmr: BigDecimal val xmr: BigDecimal
get() = BigDecimal.valueOf(atomicUnits, ATOMIC_UNIT_SCALE) get() = BigDecimal.valueOf(atomicUnits, ATOMIC_UNIT_SCALE)
val isZero: Boolean get() = atomicUnits == 0L
override fun toString() = atomicUnits.toString() override fun toString() = atomicUnits.toString()
operator fun plus(other: MoneroAmount) = operator fun plus(other: MoneroAmount) =
@ -39,6 +41,8 @@ inline val BigDecimal.xmr: MoneroAmount
return MoneroAmount(atomicUnits) return MoneroAmount(atomicUnits)
} }
inline val Number.xmr: MoneroAmount get() = (this as BigDecimal).xmr
inline val Double.xmr: MoneroAmount get() = BigDecimal(this).xmr inline val Double.xmr: MoneroAmount get() = BigDecimal(this).xmr
inline val Long.xmr: MoneroAmount get() = BigDecimal(this).xmr inline val Long.xmr: MoneroAmount get() = BigDecimal(this).xmr

24
lib/android/src/main/kotlin/im/molly/monero/MoneroCurrency.kt
View File

@ -1,5 +1,6 @@
package im.molly.monero package im.molly.monero
import java.text.DecimalFormat
import java.text.NumberFormat import java.text.NumberFormat
import java.util.Locale import java.util.Locale
import kotlin.math.absoluteValue import kotlin.math.absoluteValue
@ -19,16 +20,20 @@ object MoneroCurrency {
} }
} }
private val numberFormat = NumberFormat.getInstance(locale).apply { private val numberFormat = (DecimalFormat.getInstance(locale) as DecimalFormat).apply {
minimumFractionDigits = precision minimumFractionDigits = precision
isParseBigDecimal = true
} }
open fun format(amount: MoneroAmount): String { open fun format(amount: MoneroAmount): String {
return numberFormat.format(amount.xmr) return numberFormat.format(amount.xmr)
} }
/**
* @throw ParseException
*/
open fun parse(source: String): MoneroAmount { open fun parse(source: String): MoneroAmount {
TODO() return numberFormat.parse(source)?.xmr ?: MoneroAmount.ZERO
} }
} }
@ -59,7 +64,18 @@ object MoneroCurrency {
return outputFormat.format(amount) return outputFormat.format(amount)
} }
fun format(amount: MoneroAmount, precision: Int): String { fun format(amount: MoneroAmount, precision: Int, appendSymbol: Boolean = false): String {
return Format(precision = precision).format(amount) val formatted = Format(precision = precision).format(amount)
return if (appendSymbol) "$formatted $SYMBOL" else formatted
}
/**
* @throw ParseException
*/
fun parse(source: String, outputFormat: Format = ExactFormat): MoneroAmount {
return outputFormat.parse(source)
} }
} }
fun MoneroAmount.toFormattedString(precision: Int = 5, appendSymbol: Boolean = false): String =
MoneroCurrency.format(amount = this, precision = precision, appendSymbol = appendSymbol)