Myzel394/NumberHub
1
0
Fork 0
mirror of https://github.com/Myzel394/NumberHub.git synced 2025-06-18 16:25:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Added microgram

Browse Source 
closes: #35
This commit is contained in:
Sad Ellie 2023-04-03 12:02:53 +03:00
parent 754ba665fd
commit ff48ac6444
4 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/base/src/main/res/values/strings.xml
View File

@ -78,6 +78,8 @@
<string name="electron_mass_rest_short">me</string>
<string name="atomic_mass_unit">Dalton</string>
<string name="atomic_mass_unit_short">u</string>
<string name="microgram">Microgram</string>
<string name="microgram_short">µg</string>
<string name="milligram">Milligram</string>
<string name="milligram_short">mg</string>
<string name="gram">Gram</string>

1
data/units/src/main/java/com/sadellie/unitto/data/units/MyUnitIDS.kt
View File

@ -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"

1
data/units/src/main/java/com/sadellie/unitto/data/units/collections/Mass.kt
View File

@ -29,6 +29,7 @@ internal val massCollection: List<AbstractUnit> 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),

1
data/units/src/test/java/com/sadellie/unitto/data/units/AllUnitsTest.kt
View File

@ -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")