aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/at/hannibal2/skyhanni/utils
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/utils')
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/NumberUtil.kt21
1 files changed, 10 insertions, 11 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/NumberUtil.kt b/src/main/java/at/hannibal2/skyhanni/utils/NumberUtil.kt
index bccf92e62..d03455ac9 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/NumberUtil.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/NumberUtil.kt
@@ -163,12 +163,10 @@ object NumberUtil {
} else romanSymbols[l] + (this - l).toRoman()
}
- private fun processDecimal(decimal: Int, lastNumber: Int, lastDecimal: Int): Int {
- return if (lastNumber > decimal) {
- lastDecimal - decimal
- } else {
- lastDecimal + decimal
- }
+ private fun processDecimal(decimal: Int, lastNumber: Int, lastDecimal: Int) = if (lastNumber > decimal) {
+ lastDecimal - decimal
+ } else {
+ lastDecimal + decimal
}
val pattern = "^[0-9]*$".toPattern()
@@ -193,18 +191,19 @@ object NumberUtil {
val multiplier = if (text.endsWith("k")) {
text = text.substring(0, text.length - 1)
- 1_000
+ 1_000.0
} else if (text.endsWith("m")) {
text = text.substring(0, text.length - 1)
- 1_000_000
- }else if (text.endsWith("b")) {
+ 1.milion
+ } else if (text.endsWith("b")) {
text = text.substring(0, text.length - 1)
- 1_000_000_000
- }else 1
+ 1.bilion
+ } else 1.0
val d = text.toDouble()
return (d * multiplier).toLong()
}
val Int.milion get() = this * 1_000_000.0
+ val Int.bilion get() = this * 1_000_000_000.0
val Double.milion get() = (this * 1_000_000.0).toLong()
}