From 878d96c3860ef597b99b10265c5947a0ed8f21c0 Mon Sep 17 00:00:00 2001
From: Sad Ellie <sadellie.dev@gmail.com>
Date: Mon, 27 Feb 2023 00:52:42 +0400
Subject: [PATCH] Added nautical mile

---
 core/base/src/main/res/values/strings.xml                    | 2 ++
 .../main/java/com/sadellie/unitto/data/units/MyUnitIDS.kt    | 1 +
 .../com/sadellie/unitto/data/units/collections/Length.kt     | 1 +
 .../com/sadellie/unitto/data/units/AllUnitsRepositoryTest.kt | 5 +++--
 .../test/java/com/sadellie/unitto/data/units/AllUnitsTest.kt | 1 +
 5 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/core/base/src/main/res/values/strings.xml b/core/base/src/main/res/values/strings.xml
index 704073a5..68b26f57 100644
--- a/core/base/src/main/res/values/strings.xml
+++ b/core/base/src/main/res/values/strings.xml
@@ -38,6 +38,8 @@
     <string name="kilometer_short">km</string>
     <string name="mile">Mile</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_short">yd</string>
     <string name="foot">Foot</string>
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 add9a42a..eb6669a8 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
@@ -34,6 +34,7 @@ object MyUnitIDS {
     const val meter = "meter"
     const val kilometer = "kilometer"
     const val mile = "mile"
+    const val nautical_mile = "nautical_mile"
     const val yard = "yard"
     const val foot = "foot"
     const val inch = "inch"
diff --git a/data/units/src/main/java/com/sadellie/unitto/data/units/collections/Length.kt b/data/units/src/main/java/com/sadellie/unitto/data/units/collections/Length.kt
index 185cf43e..9c6ace49 100644
--- a/data/units/src/main/java/com/sadellie/unitto/data/units/collections/Length.kt
+++ b/data/units/src/main/java/com/sadellie/unitto/data/units/collections/Length.kt
@@ -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.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.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.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),
diff --git a/data/units/src/test/java/com/sadellie/unitto/data/units/AllUnitsRepositoryTest.kt b/data/units/src/test/java/com/sadellie/unitto/data/units/AllUnitsRepositoryTest.kt
index 07798380..6973c59b 100644
--- a/data/units/src/test/java/com/sadellie/unitto/data/units/AllUnitsRepositoryTest.kt
+++ b/data/units/src/test/java/com/sadellie/unitto/data/units/AllUnitsRepositoryTest.kt
@@ -18,8 +18,9 @@
 
 package com.sadellie.unitto.data.units
 
-import com.sadellie.unitto.data.unitgroups.ALL_UNIT_GROUPS
-import com.sadellie.unitto.data.unitgroups.UnitGroup
+import com.sadellie.unitto.data.model.ALL_UNIT_GROUPS
+import com.sadellie.unitto.data.model.AbstractUnit
+import com.sadellie.unitto.data.model.UnitGroup
 import org.junit.Assert.assertEquals
 import org.junit.Test
 
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 d23ab0b6..57746019 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
@@ -159,6 +159,7 @@ class AllUnitsTest {
         MyUnitIDS.decimeter.checkWith(MyUnitIDS.foot, "158000.7", "51837.5")
         MyUnitIDS.meter.checkWith(MyUnitIDS.yard, "158000.7", "172791.66667")
         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.foot.checkWith(MyUnitIDS.inch, "100", "1200")
         MyUnitIDS.yard.checkWith(MyUnitIDS.foot, "100", "300")