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 index 0c6c14f4..3cb0ef51 100644 --- a/app/src/main/kotlin/org/fossify/calculator/helpers/converters/VolumeConverter.kt +++ b/app/src/main/kotlin/org/fossify/calculator/helpers/converters/VolumeConverter.kt @@ -112,6 +112,20 @@ object VolumeConverter : Converter { factor = 0.000473176473, key = "PintUS" ) + + 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 = "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( nameResId = R.string.unit_volume_gill_us, @@ -186,6 +200,8 @@ object VolumeConverter : Converter { Unit.GallonUS, Unit.QuartUS, Unit.PintUS, + 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 index 23a7ed93..9d145cef 100644 --- a/app/src/main/res/values/donottranslate.xml +++ b/app/src/main/res/values/donottranslate.xml @@ -45,6 +45,8 @@ gal (US) qt (US) pt (US fl) + cup (US) + cup (US) gi (US) US fl oz bl (imp) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 11ee9475..d8ea40ff 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -63,6 +63,8 @@ Gallon (US) Quart (US) Pint (US) + Legal Cup (US) + Customary Cup (US) Gill (US) Fluid Ounce (US) Barrel (Imperial)