feat: customary us cup, more common symbol

FossifyOrg · Dec 31, 2024 · b412c1f · b412c1f
1 parent e042561
commit b412c1f
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 7 deletions.
diff --git a/app/src/main/kotlin/org/fossify/calculator/helpers/converters/VolumeConverter.kt b/app/src/main/kotlin/org/fossify/calculator/helpers/converters/VolumeConverter.kt
@@ -113,11 +113,18 @@ object VolumeConverter : Converter {
             key = "PintUS"
         )
 
-        data object CupUS : Unit(
-            nameResId = R.string.unit_volume_cup_us,
-            symbolResId = R.string.unit_volume_cup_us_symbol,
+        data object LegalCupUS : Unit(
+            nameResId = R.string.unit_volume_legal_cup_us,
+            symbolResId = R.string.unit_volume_legal_cup_us_symbol,
             factor = 0.00024,
-            key = "CupUS"
+            key = "LegalCupUS"
+        )
+
+        data object CustomaryCupUS : Unit(
+            nameResId = R.string.unit_volume_customary_cup_us,
+            symbolResId = R.string.unit_volume_customary_cup_us_symbol,
+            factor = 0.0002365882365,
+            key = "CustomaryCupUS"
         )
 
         data object GillUS : Unit(
@@ -193,7 +200,8 @@ object VolumeConverter : Converter {
         Unit.GallonUS,
         Unit.QuartUS,
         Unit.PintUS,
-        Unit.CupUS,
+        Unit.LegalCupUS,
+        Unit.CustomaryCupUS,
         Unit.GillUS,
         Unit.FluidOunceUS,
         Unit.BarrelImperial,

diff --git a/app/src/main/res/values/donottranslate.xml b/app/src/main/res/values/donottranslate.xml
@@ -45,7 +45,8 @@
     <string name="unit_volume_gallon_us_symbol">gal (US)</string>
     <string name="unit_volume_quart_us_symbol">qt (US)</string>
     <string name="unit_volume_pint_us_symbol">pt (US fl)</string>
-    <string name="unit_volume_cup_us_symbol">c (US)</string>
+    <string name="unit_volume_legal_cup_us_symbol">cup (US)</string>
+    <string name="unit_volume_customary_cup_us_symbol">cup (US)</string>
     <string name="unit_volume_gill_us_symbol">gi (US)</string>
     <string name="unit_volume_fluid_ounce_us_symbol">US fl oz</string>
     <string name="unit_volume_barrel_imperial_symbol">bl (imp)</string>

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -63,7 +63,8 @@
     <string name="unit_volume_gallon_us">Gallon (US)</string>
     <string name="unit_volume_quart_us">Quart (US)</string>
     <string name="unit_volume_pint_us">Pint (US)</string>
-    <string name="unit_volume_cup_us">Cup (US)</string>
+    <string name="unit_volume_legal_cup_us">Legal Cup (US)</string>
+    <string name="unit_volume_customary_cup_us">Customary Cup (US)</string>
     <string name="unit_volume_gill_us">Gill (US)</string>
     <string name="unit_volume_fluid_ounce_us">Fluid Ounce (US)</string>
     <string name="unit_volume_barrel_imperial">Barrel (Imperial)</string>