Merge branch 'fix/enc-separator' into 'master'

Consistence encumbrance decimal separator See merge request fmasa/wfrp-master!195
fmasa · Feb 20, 2021 · b106d46 · b106d46
2 parents af8c733 + ca810d5
commit b106d46
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 8 deletions.
diff --git a/app/inventory/src/main/java/cz/frantisekmasa/wfrp_master/inventory/domain/Encumbrance.kt b/app/inventory/src/main/java/cz/frantisekmasa/wfrp_master/inventory/domain/Encumbrance.kt
@@ -4,6 +4,7 @@ import android.os.Parcelable
 import com.fasterxml.jackson.annotation.JsonValue
 import cz.frantisekmasa.wfrp_master.core.domain.Stats
 import kotlinx.parcelize.Parcelize
+import java.text.DecimalFormat
 
 @Parcelize
 data class Encumbrance(
@@ -12,6 +13,7 @@ data class Encumbrance(
 ) : Parcelable {
     companion object {
         val Zero: Encumbrance = Encumbrance(0.0)
+        private val formatter = DecimalFormat("#,##0.###")
 
         fun maximumForCharacter(characteristics: Stats): Encumbrance = Encumbrance(
             (characteristics.strengthBonus + characteristics.toughnessBonus).toDouble()
@@ -26,12 +28,7 @@ data class Encumbrance(
     operator fun times(multiplier: Int) = Encumbrance(value * multiplier)
     operator fun plus(addend: Encumbrance) = Encumbrance(value + addend.value)
 
-    override fun toString(): String = value.formatWithMaximumDecimalPlaces(3)
+    override fun toString(): String = formatter.format(value)
 }
 
 fun Iterable<Encumbrance>.sum(): Encumbrance = fold(Encumbrance.Zero) { a, b -> a + b }
-
-private fun Double.formatWithMaximumDecimalPlaces(decimals: Int) =
-    "%.${decimals}f".format(this)
-        .trimEnd('0')
-        .trimEnd('.')
diff --git a/app/inventory/src/test/java/cz/frantisekmasa/wfrp_master/inventory/domain/EncumbranceTest.kt b/app/inventory/src/test/java/cz/frantisekmasa/wfrp_master/inventory/domain/EncumbranceTest.kt
@@ -35,5 +35,6 @@ class EncumbranceTest {
         assertEquals("0.001", Encumbrance(0.001).toString())
         assertEquals("10", Encumbrance(10.000).toString())
         assertEquals("12", Encumbrance(12.0).toString())
+        assertEquals("12,000", Encumbrance(12000.0).toString())
     }
 }
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -7,7 +7,7 @@ buildscript {
     }
 
     dependencies {
-        classpath("com.android.tools.build:gradle:7.0.0-alpha05")
+        classpath("com.android.tools.build:gradle:7.0.0-alpha07")
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.21")
 
         // Firebase-related dependencies

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Mon Aug 31 09:56:08 CEST 2020
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https://services.gradle.org/distributions/gradle-6.8-bin.zip
+distributionUrl=https://services.gradle.org/distributions/gradle-6.8.1-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME