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

Added missing pressure units (#17)

Browse Source
This commit is contained in:
Sad Ellie 2023-01-18 22:38:25 +04:00
parent 35961e8629
commit 6eaaf68ae0
4 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -428,8 +428,12 @@
<string name="dekapascal_short">daPa</string>
<string name="hectopascal">Hectopascal</string>
<string name="hectopascal_short">hPa</string>
<string name="millibar">Millibar</string>
<string name="millibar_short">mbar</string>
<string name="bar">Bar</string>
<string name="bar_short">bar</string>
<string name="kilopascal">Kilopascal</string>
<string name="kilopascal_short">kPa</string>
<string name="megapascal">Megapascal</string>
<string name="megapascal_short">MPa</string>
<string name="gigapascal">Gigapascal</string>
@ -448,6 +452,8 @@
<string name="standard_atmosphere_short">atm</string>
<string name="torr">Torr</string>
<string name="torr_short">torr</string>
<string name="micron_of_mercury">Millimeter of mercury</string>
<string name="micron_of_mercury_short">μmHg</string>
<string name="millimeter_of_mercury">Millimeter of mercury</string>
<string name="millimeter_of_mercury_short">mm Hg</string>

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

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

3
data/src/main/java/com/sadellie/unitto/data/units/collections/Pressure.kt
View File

@ -38,7 +38,9 @@ internal val pressureCollection: List<AbstractUnit> 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<AbstractUnit> 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),
)
}

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

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