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

Added nautical mile

Browse Source
This commit is contained in:
Sad Ellie 2023-02-27 00:52:42 +04:00
parent 29dc0098d8
commit 878d96c386
5 changed files with 8 additions and 2 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

@ -38,6 +38,8 @@
<string name="kilometer_short">km</string> <string name="kilometer_short">km</string>
<string name="mile">Mile</string> <string name="mile">Mile</string>
<string name="mile_short">Mi</string> <string name="mile_short">Mi</string>
<string name="nautical_mile">Nautical mile</string>
<string name="nautical_mile_short">M</string>
<string name="yard">Yard</string> <string name="yard">Yard</string>
<string name="yard_short">yd</string> <string name="yard_short">yd</string>
<string name="foot">Foot</string> <string name="foot">Foot</string>

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

@ -34,6 +34,7 @@ object MyUnitIDS {
const val meter = "meter" const val meter = "meter"
const val kilometer = "kilometer" const val kilometer = "kilometer"
const val mile = "mile" const val mile = "mile"
const val nautical_mile = "nautical_mile"
const val yard = "yard" const val yard = "yard"
const val foot = "foot" const val foot = "foot"
const val inch = "inch" const val inch = "inch"

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

@ -35,6 +35,7 @@ internal val lengthCollection: List<AbstractUnit> by lazy {
MyUnit(MyUnitIDS.decimeter, BigDecimal.valueOf(1.0E+17), UnitGroup.LENGTH, R.string.decimeter, R.string.decimeter_short), MyUnit(MyUnitIDS.decimeter, BigDecimal.valueOf(1.0E+17), UnitGroup.LENGTH, R.string.decimeter, R.string.decimeter_short),
MyUnit(MyUnitIDS.meter, BigDecimal.valueOf(1.0E+18), UnitGroup.LENGTH, R.string.meter, R.string.meter_short), MyUnit(MyUnitIDS.meter, BigDecimal.valueOf(1.0E+18), UnitGroup.LENGTH, R.string.meter, R.string.meter_short),
MyUnit(MyUnitIDS.kilometer, BigDecimal.valueOf(1.0E+21), UnitGroup.LENGTH, R.string.kilometer, R.string.kilometer_short), MyUnit(MyUnitIDS.kilometer, BigDecimal.valueOf(1.0E+21), UnitGroup.LENGTH, R.string.kilometer, R.string.kilometer_short),
MyUnit(MyUnitIDS.nautical_mile, BigDecimal.valueOf(1.852E+21), UnitGroup.LENGTH, R.string.nautical_mile, R.string.nautical_mile_short),
MyUnit(MyUnitIDS.inch, BigDecimal.valueOf(25_400_000_000_000_000), UnitGroup.LENGTH, R.string.inch, R.string.inch_short), MyUnit(MyUnitIDS.inch, BigDecimal.valueOf(25_400_000_000_000_000), UnitGroup.LENGTH, R.string.inch, R.string.inch_short),
MyUnit(MyUnitIDS.foot, BigDecimal.valueOf(304_800_000_000_002_200), UnitGroup.LENGTH, R.string.foot, R.string.foot_short), MyUnit(MyUnitIDS.foot, BigDecimal.valueOf(304_800_000_000_002_200), UnitGroup.LENGTH, R.string.foot, R.string.foot_short),
MyUnit(MyUnitIDS.yard, BigDecimal.valueOf(914_400_000_000_006_400), UnitGroup.LENGTH, R.string.yard, R.string.yard_short), MyUnit(MyUnitIDS.yard, BigDecimal.valueOf(914_400_000_000_006_400), UnitGroup.LENGTH, R.string.yard, R.string.yard_short),

5
data/units/src/test/java/com/sadellie/unitto/data/units/AllUnitsRepositoryTest.kt
View File

@ -18,8 +18,9 @@
package com.sadellie.unitto.data.units package com.sadellie.unitto.data.units
import com.sadellie.unitto.data.unitgroups.ALL_UNIT_GROUPS import com.sadellie.unitto.data.model.ALL_UNIT_GROUPS
import com.sadellie.unitto.data.unitgroups.UnitGroup import com.sadellie.unitto.data.model.AbstractUnit
import com.sadellie.unitto.data.model.UnitGroup
import org.junit.Assert.assertEquals import org.junit.Assert.assertEquals
import org.junit.Test import org.junit.Test

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

@ -159,6 +159,7 @@ class AllUnitsTest {
MyUnitIDS.decimeter.checkWith(MyUnitIDS.foot, "158000.7", "51837.5") MyUnitIDS.decimeter.checkWith(MyUnitIDS.foot, "158000.7", "51837.5")
MyUnitIDS.meter.checkWith(MyUnitIDS.yard, "158000.7", "172791.66667") MyUnitIDS.meter.checkWith(MyUnitIDS.yard, "158000.7", "172791.66667")
MyUnitIDS.kilometer.checkWith(MyUnitIDS.mile, "100", "62.13712") MyUnitIDS.kilometer.checkWith(MyUnitIDS.mile, "100", "62.13712")
MyUnitIDS.nautical_mile.checkWith(MyUnitIDS.kilometer, "100", "185.2")
MyUnitIDS.inch.checkWith(MyUnitIDS.foot, "100", "8.33333") MyUnitIDS.inch.checkWith(MyUnitIDS.foot, "100", "8.33333")
MyUnitIDS.foot.checkWith(MyUnitIDS.inch, "100", "1200") MyUnitIDS.foot.checkWith(MyUnitIDS.inch, "100", "1200")
MyUnitIDS.yard.checkWith(MyUnitIDS.foot, "100", "300") MyUnitIDS.yard.checkWith(MyUnitIDS.foot, "100", "300")