From ff48ac644434a941d828d32435ff86a91cdffa59 Mon Sep 17 00:00:00 2001 From: Sad Ellie Date: Mon, 3 Apr 2023 12:02:53 +0300 Subject: [PATCH] Added microgram closes: #35 --- core/base/src/main/res/values/strings.xml | 2 ++ .../src/main/java/com/sadellie/unitto/data/units/MyUnitIDS.kt | 1 + .../java/com/sadellie/unitto/data/units/collections/Mass.kt | 1 + .../test/java/com/sadellie/unitto/data/units/AllUnitsTest.kt | 1 + 4 files changed, 5 insertions(+) diff --git a/core/base/src/main/res/values/strings.xml b/core/base/src/main/res/values/strings.xml index 8f2d9572..1ddab2a9 100644 --- a/core/base/src/main/res/values/strings.xml +++ b/core/base/src/main/res/values/strings.xml @@ -78,6 +78,8 @@ me Dalton u + Microgram + µg Milligram mg Gram diff --git a/data/units/src/main/java/com/sadellie/unitto/data/units/MyUnitIDS.kt b/data/units/src/main/java/com/sadellie/unitto/data/units/MyUnitIDS.kt index 686b4149..85360a50 100644 --- a/data/units/src/main/java/com/sadellie/unitto/data/units/MyUnitIDS.kt +++ b/data/units/src/main/java/com/sadellie/unitto/data/units/MyUnitIDS.kt @@ -55,6 +55,7 @@ object MyUnitIDS { // MASS const val electron_mass_rest = "electron_mass_rest" const val atomic_mass_unit = "atomic_mass_unit" + const val microgram = "microgram" const val milligram = "milligram" const val gram = "gram" const val kilogram = "kilogram" diff --git a/data/units/src/main/java/com/sadellie/unitto/data/units/collections/Mass.kt b/data/units/src/main/java/com/sadellie/unitto/data/units/collections/Mass.kt index b4cfc0af..4f10d33c 100644 --- a/data/units/src/main/java/com/sadellie/unitto/data/units/collections/Mass.kt +++ b/data/units/src/main/java/com/sadellie/unitto/data/units/collections/Mass.kt @@ -29,6 +29,7 @@ internal val massCollection: List by lazy { listOf( DefaultUnit(MyUnitIDS.electron_mass_rest, BigDecimal.valueOf(9.1093897E-28), UnitGroup.MASS, R.string.electron_mass_rest, R.string.electron_mass_rest_short), DefaultUnit(MyUnitIDS.atomic_mass_unit, BigDecimal.valueOf(1.6605402E-24), UnitGroup.MASS, R.string.atomic_mass_unit, R.string.atomic_mass_unit_short), + DefaultUnit(MyUnitIDS.microgram, BigDecimal(1E-6), UnitGroup.MASS, R.string.microgram, R.string.microgram_short), DefaultUnit(MyUnitIDS.milligram, BigDecimal.valueOf(1E-3), UnitGroup.MASS, R.string.milligram, R.string.milligram_short), DefaultUnit(MyUnitIDS.gram, BigDecimal.valueOf(1), UnitGroup.MASS, R.string.gram, R.string.gram_short), DefaultUnit(MyUnitIDS.kilogram, BigDecimal.valueOf(1E+3), UnitGroup.MASS, R.string.kilogram, R.string.kilogram_short), diff --git a/data/units/src/test/java/com/sadellie/unitto/data/units/AllUnitsTest.kt b/data/units/src/test/java/com/sadellie/unitto/data/units/AllUnitsTest.kt index c1a58709..314db4d2 100644 --- a/data/units/src/test/java/com/sadellie/unitto/data/units/AllUnitsTest.kt +++ b/data/units/src/test/java/com/sadellie/unitto/data/units/AllUnitsTest.kt @@ -183,6 +183,7 @@ class AllUnitsTest { fun testMass() = testWithUnits { electron_mass_rest.checkWith(milligram, "1500000000000000000", "0.000001") atomic_mass_unit.checkWith(electron_mass_rest, "150", "273433.27951") + microgram.checkWith(gram, "1500", "0.0015") milligram.checkWith(ounce, "1500", "0.05291") gram.checkWith(ounce, "1500", "52.91094") kilogram.checkWith(carat, "1500", "7500000")