diff --git a/core/base/src/main/res/values/strings.xml b/core/base/src/main/res/values/strings.xml index 22662322..d8061699 100644 --- a/core/base/src/main/res/values/strings.xml +++ b/core/base/src/main/res/values/strings.xml @@ -428,8 +428,12 @@ daPa Hectopascal hPa + Millibar + mbar Bar bar + Kilopascal + kPa Megapascal MPa Gigapascal @@ -448,6 +452,8 @@ atm Torr torr + Millimeter of mercury + μmHg Millimeter of mercury mm Hg diff --git a/data/src/main/java/com/sadellie/unitto/data/units/MyUnitIDS.kt b/data/src/main/java/com/sadellie/unitto/data/units/MyUnitIDS.kt index 8e1a122b..add9a42a 100644 --- a/data/src/main/java/com/sadellie/unitto/data/units/MyUnitIDS.kt +++ b/data/src/main/java/com/sadellie/unitto/data/units/MyUnitIDS.kt @@ -241,7 +241,9 @@ object MyUnitIDS { const val pascal = "pascal" const val dekapascal = "dekapascal" const val hectopascal = "hectopascal" + const val millibar = "millibar" const val bar = "bar" + const val kilopascal = "kilopascal" const val megapascal = "megapascal" const val gigapascal = "gigapascal" const val terapascal = "terapascal" @@ -251,6 +253,7 @@ object MyUnitIDS { const val ksi = "ksi" const val standard_atmosphere = "standard_atmosphere" const val torr = "torr" + const val micron_of_mercury = "micron_of_mercury" const val millimeter_of_mercury = "millimeter_of_mercury" // ACCELERATION diff --git a/data/src/main/java/com/sadellie/unitto/data/units/collections/Pressure.kt b/data/src/main/java/com/sadellie/unitto/data/units/collections/Pressure.kt index becbd798..f6baf009 100644 --- a/data/src/main/java/com/sadellie/unitto/data/units/collections/Pressure.kt +++ b/data/src/main/java/com/sadellie/unitto/data/units/collections/Pressure.kt @@ -38,7 +38,9 @@ internal val pressureCollection: List by lazy { MyUnit(MyUnitIDS.pascal, BigDecimal.valueOf(1E+18), UnitGroup.PRESSURE, R.string.pascal, R.string.pascal_short), MyUnit(MyUnitIDS.dekapascal, BigDecimal.valueOf(1E+19), UnitGroup.PRESSURE, R.string.dekapascal, R.string.dekapascal_short), MyUnit(MyUnitIDS.hectopascal, BigDecimal.valueOf(1E+20), UnitGroup.PRESSURE, R.string.hectopascal, R.string.hectopascal_short), + MyUnit(MyUnitIDS.millibar, BigDecimal.valueOf(1E+20), UnitGroup.PRESSURE, R.string.millibar, R.string.millibar_short), MyUnit(MyUnitIDS.bar, BigDecimal.valueOf(1E+23), UnitGroup.PRESSURE, R.string.bar, R.string.bar_short), + MyUnit(MyUnitIDS.kilopascal, BigDecimal.valueOf(1E+21), UnitGroup.PRESSURE, R.string.kilopascal, R.string.kilopascal_short), MyUnit(MyUnitIDS.megapascal, BigDecimal.valueOf(1E+24), UnitGroup.PRESSURE, R.string.megapascal, R.string.megapascal_short), MyUnit(MyUnitIDS.gigapascal, BigDecimal.valueOf(1E+27), UnitGroup.PRESSURE, R.string.gigapascal, R.string.gigapascal_short), MyUnit(MyUnitIDS.terapascal, BigDecimal.valueOf(1E+30), UnitGroup.PRESSURE, R.string.terapascal, R.string.terapascal_short), @@ -48,6 +50,7 @@ internal val pressureCollection: List by lazy { MyUnit(MyUnitIDS.ksi, BigDecimal.valueOf(6.8947572931783E+24), UnitGroup.PRESSURE, R.string.ksi, R.string.ksi_short), MyUnit(MyUnitIDS.standard_atmosphere, BigDecimal.valueOf(101.325E+21), UnitGroup.PRESSURE, R.string.standard_atmosphere, R.string.standard_atmosphere_short), MyUnit(MyUnitIDS.torr, BigDecimal.valueOf(1.3332236842108281E+20), UnitGroup.PRESSURE, R.string.torr, R.string.torr_short), + MyUnit(MyUnitIDS.micron_of_mercury, BigDecimal.valueOf(1.3332236842108281E+17), UnitGroup.PRESSURE, R.string.micron_of_mercury, R.string.micron_of_mercury_short), MyUnit(MyUnitIDS.millimeter_of_mercury, BigDecimal.valueOf(1.3332236842108281E+20), UnitGroup.PRESSURE, R.string.millimeter_of_mercury, R.string.millimeter_of_mercury_short), ) } \ No newline at end of file diff --git a/data/src/test/java/com/sadellie/unitto/data/units/AllUnitsTest.kt b/data/src/test/java/com/sadellie/unitto/data/units/AllUnitsTest.kt index b4d61c72..660f5ee1 100644 --- a/data/src/test/java/com/sadellie/unitto/data/units/AllUnitsTest.kt +++ b/data/src/test/java/com/sadellie/unitto/data/units/AllUnitsTest.kt @@ -222,7 +222,9 @@ class AllUnitsTest { MyUnitIDS.pascal.checkWith(MyUnitIDS.bar, "456", "0.00456") MyUnitIDS.dekapascal.checkWith(MyUnitIDS.bar, "456", "0.0456") MyUnitIDS.hectopascal.checkWith(MyUnitIDS.psi, "456", "6.61372") + MyUnitIDS.millibar.checkWith(MyUnitIDS.psi, "456", "6.61372") MyUnitIDS.bar.checkWith(MyUnitIDS.ksi, "456", "6.61372") + MyUnitIDS.kilopascal.checkWith(MyUnitIDS.psi, "456", "66.13721") MyUnitIDS.megapascal.checkWith(MyUnitIDS.ksi, "456", "66.13721") MyUnitIDS.gigapascal.checkWith(MyUnitIDS.torr, "456", "3420281273.13024") MyUnitIDS.terapascal.checkWith(MyUnitIDS.gigapascal, "456", "456000") @@ -232,6 +234,7 @@ class AllUnitsTest { MyUnitIDS.ksi.checkWith(MyUnitIDS.gigapascal, "456", "3.14401") MyUnitIDS.standard_atmosphere.checkWith(MyUnitIDS.torr, "456", "346560") MyUnitIDS.torr.checkWith(MyUnitIDS.hectopascal, "456", "607.95") + MyUnitIDS.micron_of_mercury.checkWith(MyUnitIDS.hectopascal, "456", "0.60795") MyUnitIDS.millimeter_of_mercury.checkWith(MyUnitIDS.hectopascal, "456", "607.95") }