From 0b2e3743bbd35ce3403f5ba40e7525a36987afba Mon Sep 17 00:00:00 2001 From: Melissa Linkert Date: Sun, 1 Jul 2018 14:16:20 -0500 Subject: [PATCH 1/2] Add support for "are" unit See https://github.com/physphil/UnitConverterUltimate/issues/48 and https://en.wikipedia.org/wiki/Hectare#Are --- .../physphil/android/unitconverterultimate/models/Unit.java | 3 ++- .../android/unitconverterultimate/util/Conversions.java | 1 + app/src/main/res/values/strings.xml | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/physphil/android/unitconverterultimate/models/Unit.java b/app/src/main/java/com/physphil/android/unitconverterultimate/models/Unit.java index f8e0bbb5..95ca7f48 100644 --- a/app/src/main/java/com/physphil/android/unitconverterultimate/models/Unit.java +++ b/app/src/main/java/com/physphil/android/unitconverterultimate/models/Unit.java @@ -33,6 +33,7 @@ public class Unit { public static final int SQ_FOOT = 6; public static final int SQ_INCH = 7; public static final int ACRE = 8; + public static final int ARE = 9; public static final int AUD = 1300; public static final int BGN = 1301; @@ -189,7 +190,7 @@ public class Unit { public static final int CUBIC_FOOT = 1218; public static final int CUBIC_YARD = 1219; - @IntDef({SQ_KILOMETRES, SQ_METRES, SQ_CENTIMETRES, HECTARE, SQ_MILE, SQ_YARD, SQ_FOOT, SQ_INCH, ACRE, + @IntDef({SQ_KILOMETRES, SQ_METRES, SQ_CENTIMETRES, HECTARE, SQ_MILE, SQ_YARD, SQ_FOOT, SQ_INCH, ACRE, ARE, AUD, BGN, BRL, CDN, CHF, CNY, CZK, DKK, EUR, GBP, HKD, HRK, HUF, IDR, ILS, INR, JPY, KRW, MXN, MYR, NOK, NZD, PHP, PLN, RON, RUB, SEK, SGD, THB, LIRA, USD, ZAR, BIT, BYTE, KILOBIT, KILOBYTE, MEGABIT, MEGABYTE, GIGABIT, GIGABYTE, TERABIT, TERABYTE, JOULE, KILOJOULE, CALORIE, KILOCALORIE, BTU, FT_LBF, IN_LBF, KILOWATT_HOUR, ELECTRON_VOLT, diff --git a/app/src/main/java/com/physphil/android/unitconverterultimate/util/Conversions.java b/app/src/main/java/com/physphil/android/unitconverterultimate/util/Conversions.java index 568965f1..eb8f0e0d 100644 --- a/app/src/main/java/com/physphil/android/unitconverterultimate/util/Conversions.java +++ b/app/src/main/java/com/physphil/android/unitconverterultimate/util/Conversions.java @@ -107,6 +107,7 @@ private void getAreaConversions() { units.add(new Unit(SQ_FOOT, R.string.sq_foot, 0.09290304, 10.7639104167097223)); units.add(new Unit(SQ_INCH, R.string.sq_inch, 0.00064516, 1550.00310000620001)); units.add(new Unit(ACRE, R.string.acre, 4046.8564224, 0.000247105381467165342)); + units.add(new Unit(ARE, R.string.are, 100.0, 0.01)); addConversion(Conversion.AREA, new Conversion(Conversion.AREA, R.string.area, units)); } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 64e3bf57..913d2c2f 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -113,6 +113,7 @@ Sq Foot Sq Inch Acre + Are Bit From d5c89994b6ccdbb3e8b79784a5eef698308d91da Mon Sep 17 00:00:00 2001 From: Melissa Linkert Date: Sun, 1 Jul 2018 14:17:20 -0500 Subject: [PATCH 2/2] Add German and French translations for "are" unit See https://de.wikipedia.org/wiki/Ar_(Einheit) and https://fr.wikipedia.org/wiki/Are --- app/src/main/res/values-de/strings.xml | 1 + app/src/main/res/values-fr/strings.xml | 1 + 2 files changed, 2 insertions(+) diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index a92e8865..d160d322 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -98,6 +98,7 @@ Quadratfuß Quadratzoll Acre + Ar Bit diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index e3a45ebd..6cd53dc7 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -98,6 +98,7 @@ Pied carré Pouce Carré Acre + Are Bit