diff --git a/app/src/main/java/com/physphil/android/unitconverterultimate/MainActivity.java b/app/src/main/java/com/physphil/android/unitconverterultimate/MainActivity.java index ca804179..1ab94c1e 100644 --- a/app/src/main/java/com/physphil/android/unitconverterultimate/MainActivity.java +++ b/app/src/main/java/com/physphil/android/unitconverterultimate/MainActivity.java @@ -145,6 +145,9 @@ private int getConversionFromDrawer(int itemId) { case R.id.drawer_storage: return Conversion.STORAGE; + case R.id.drawer_electric_potential: + return Conversion.ELECTRIC_POTENTIAL; + case R.id.drawer_energy: return Conversion.ENERGY; @@ -192,28 +195,30 @@ private int getMenuPositionOfConversion(@Conversion.id final int conversion) { return 2; case Conversion.STORAGE: return 3; - case Conversion.ENERGY: + case Conversion.ELECTRIC_POTENTIAL: return 4; - case Conversion.FUEL: + case Conversion.ENERGY: return 5; - case Conversion.LENGTH: + case Conversion.FUEL: return 6; - case Conversion.MASS: + case Conversion.LENGTH: return 7; - case Conversion.POWER: + case Conversion.MASS: return 8; - case Conversion.PRESSURE: + case Conversion.POWER: return 9; - case Conversion.SPEED: + case Conversion.PRESSURE: return 10; - case Conversion.TEMPERATURE: + case Conversion.SPEED: return 11; - case Conversion.TIME: + case Conversion.TEMPERATURE: return 12; - case Conversion.TORQUE: + case Conversion.TIME: return 13; - case Conversion.VOLUME: + case Conversion.TORQUE: return 14; + case Conversion.VOLUME: + return 15; default: return 0; } diff --git a/app/src/main/java/com/physphil/android/unitconverterultimate/models/Conversion.java b/app/src/main/java/com/physphil/android/unitconverterultimate/models/Conversion.java index 126a4df0..1a2fb3e7 100644 --- a/app/src/main/java/com/physphil/android/unitconverterultimate/models/Conversion.java +++ b/app/src/main/java/com/physphil/android/unitconverterultimate/models/Conversion.java @@ -43,13 +43,14 @@ public final class Conversion { public static final int TIME = 11; public static final int TORQUE = 12; public static final int VOLUME = 13; + public static final int ELECTRIC_POTENTIAL = 15; private int id; private int labelResource; private List units; @IntDef({AREA, COOKING, CURRENCY, STORAGE, ENERGY, FUEL, LENGTH, MASS, POWER, PRESSURE, SPEED, - TEMPERATURE, TIME, TORQUE, VOLUME}) + TEMPERATURE, TIME, TORQUE, VOLUME, ELECTRIC_POTENTIAL}) public @interface id { } 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..2d76cc09 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 @@ -189,6 +189,17 @@ public class Unit { public static final int CUBIC_FOOT = 1218; public static final int CUBIC_YARD = 1219; + public static final int VOLT = 1400; + public static final int MILLIVOLT = 1401; + public static final int MICROVOLT = 1402; + public static final int NANOVOLT = 1403; + public static final int KILOVOLT = 1404; + public static final int MEGAVOLT = 1405; + public static final int GIGAVOLT = 1406; + public static final int ABVOLT = 1407; + public static final int STATVOLT = 1408; + public static final int WATT_AMPERE = 1409; + @IntDef({SQ_KILOMETRES, SQ_METRES, SQ_CENTIMETRES, HECTARE, SQ_MILE, SQ_YARD, SQ_FOOT, SQ_INCH, ACRE, 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, @@ -203,7 +214,8 @@ public class Unit { YEAR, MONTH, WEEK, DAY, HOUR, MINUTE, SECOND, MILLISECOND, NANOSECOND, N_M, TEASPOON, TABLESPOON, CUP, FLUID_OUNCE, QUART, PINT, GALLON, BARREL, FLUID_OUNCE_UK, QUART_UK, PINT_UK, - GALLON_UK, BARREL_UK, MILLILITRE, LITRE, CUBIC_CM, CUBIC_M, CUBIC_INCH, CUBIC_FOOT, CUBIC_YARD}) + GALLON_UK, BARREL_UK, MILLILITRE, LITRE, CUBIC_CM, CUBIC_M, CUBIC_INCH, CUBIC_FOOT, CUBIC_YARD, + VOLT, MILLIVOLT, MICROVOLT, NANOVOLT, KILOVOLT, MEGAVOLT, GIGAVOLT, ABVOLT, STATVOLT, WATT_AMPERE}) public @interface id {} private int id; 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 bc3856f5..c8cd2950 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 @@ -71,6 +71,7 @@ private Conversions() { getTimeConversions(); getTorqueConversions(); getVolumeConversions(); + getElectricPotential(); mCurrencyUpdated = false; } @@ -361,6 +362,22 @@ private void getVolumeConversions() { addConversion(Conversion.VOLUME, new Conversion(Conversion.VOLUME, R.string.volume, units)); } + private void getElectricPotential(){ + //Base unit - Volt + List units = new ArrayList<>(); + units.add(new Unit(VOLT, R.string.volt, 1.0, 1.0)); + units.add(new Unit(MILLIVOLT, R.string.millivolt, 0.001, 1000.0)); + units.add(new Unit(MICROVOLT, R.string.microvolt, 0.000001, 1000000.0)); + units.add(new Unit(NANOVOLT, R.string.nanovolt, 0.000000001, 1000000000.0)); + units.add(new Unit(KILOVOLT, R.string.kilovolt, 1000.0, 0.001)); + units.add(new Unit(MEGAVOLT, R.string.megavolt, 1000000.0, 0.000001)); + units.add(new Unit(GIGAVOLT, R.string.gigavolt, 1000000000.0, 0.000000001)); + units.add(new Unit(ABVOLT, R.string.abvolt, 0.00000001, 100000000.0)); + units.add(new Unit(STATVOLT, R.string.statvolt, 299.792458, 0.003335640952)); + units.add(new Unit(WATT_AMPERE, R.string.watt_ampere, 1.0, 1.0)); + addConversion(Conversion.ELECTRIC_POTENTIAL, new Conversion(Conversion.ELECTRIC_POTENTIAL, R.string.electric_potential, units)); + } + public boolean hasCurrency() { return mConversions.get(Conversion.CURRENCY).getUnits().size() > 0; } diff --git a/app/src/main/res/drawable-hdpi/ic_electric_potential.png b/app/src/main/res/drawable-hdpi/ic_electric_potential.png new file mode 100644 index 00000000..865539bb Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_electric_potential.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_electric_potential.png b/app/src/main/res/drawable-mdpi/ic_electric_potential.png new file mode 100644 index 00000000..1f2f0c08 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_electric_potential.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_electric_potential.png b/app/src/main/res/drawable-xhdpi/ic_electric_potential.png new file mode 100644 index 00000000..4689c429 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_electric_potential.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_electric_potential.png b/app/src/main/res/drawable-xxhdpi/ic_electric_potential.png new file mode 100644 index 00000000..a8277cfd Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_electric_potential.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_electric_potential.png b/app/src/main/res/drawable-xxxhdpi/ic_electric_potential.png new file mode 100644 index 00000000..891ad900 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_electric_potential.png differ diff --git a/app/src/main/res/menu/menu_navigation_drawer.xml b/app/src/main/res/menu/menu_navigation_drawer.xml index 9675ea53..e1884200 100644 --- a/app/src/main/res/menu/menu_navigation_drawer.xml +++ b/app/src/main/res/menu/menu_navigation_drawer.xml @@ -40,6 +40,11 @@ android:icon="@drawable/ic_storage" android:title="@string/storage"/> + + Tiempo Torsión Volumen + Potencial eléctrico Kilómetro cuadrado @@ -265,4 +266,17 @@ Dólar estadounidense Rand sudafricano + + Voltio + Milivoltio + Microvoltio + Nanovoltio + Kilovoltio + Megavoltio + Gigavoltio + Abvoltio + Statvoltio + Vatio por amperio + + diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 45f9ea99..31c3c6bc 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -86,6 +86,7 @@ Tempo Torque Volume + Potencial elétrico Quilômetro Quadrado @@ -267,4 +268,17 @@ Dólar dos Estados Unidos Rand Sul Africano + + Volt + Milivolt + Microvolt + Nanovolt + Quilovolt + Megavolt + Gigavolt + Abvolt + Statvolt + Watt por ampère + + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index d7e26337..d07810e3 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -85,6 +85,7 @@ Time Torque Volume + Electric potential Sq Kilometre @@ -265,4 +266,16 @@ American Dollar South African Rand + + Volt + Millivolt + Microvolt + Nanovolt + Kilovolt + Megavolt + Gigavolt + Abvolt + Statvolt + Watt per ampere + \ No newline at end of file