New conversion - Electric potential

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;
         }

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<Unit> 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 {
     }
 

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;

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<Unit> 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;
     }

app/src/main/res/menu/menu_navigation_drawer.xml

@@ -40,6 +40,11 @@
             android:icon="@drawable/ic_storage"
             android:title="@string/storage"/>
 
+        <item
+            android:id="@+id/drawer_electric_potential"
+            android:icon="@drawable/ic_electric_potential"
+            android:title="@string/electric_potential"/>
+
         <item
             android:id="@+id/drawer_energy"
             android:icon="@drawable/ic_energy"

app/src/main/res/values-es/strings.xml

@@ -85,6 +85,7 @@
     <string name="time">Tiempo</string>
     <string name="torque">Torsión</string>
     <string name="volume">Volumen</string>
+    <string name="electric_potential">Potencial eléctrico</string>
 
     <!-- Area -->
     <string name="sq_kilometre">Kilómetro cuadrado</string>
@@ -265,4 +266,17 @@
     <string name="usd">Dólar estadounidense</string>
     <string name="zar">Rand sudafricano</string>
 
+    <!-- Electric Potential -->
+    <string name="volt">Voltio</string>
+    <string name="millivolt">Milivoltio</string>
+    <string name="microvolt">Microvoltio</string>
+    <string name="nanovolt">Nanovoltio</string>
+    <string name="kilovolt">Kilovoltio</string>
+    <string name="megavolt">Megavoltio</string>
+    <string name="gigavolt">Gigavoltio</string>
+    <string name="abvolt">Abvoltio</string>
+    <string name="statvolt">Statvoltio</string>
+    <string name="watt_ampere">Vatio por amperio</string>
+
+
 </resources>

app/src/main/res/values-pt-rBR/strings.xml

@@ -86,6 +86,7 @@
     <string name="time">Tempo</string>
     <string name="torque">Torque</string>
     <string name="volume">Volume</string>
+    <string name="electric_potential">Potencial elétrico</string>
 
     <!-- Área -->
     <string name="sq_kilometre">Quilômetro Quadrado</string>
@@ -267,4 +268,17 @@
     <string name="usd">Dólar dos Estados Unidos</string>
     <string name="zar">Rand Sul Africano</string>
 
+    <!-- Potencial eletrico -->
+    <string name="volt">Volt</string>
+    <string name="millivolt">Milivolt</string>
+    <string name="microvolt">Microvolt</string>
+    <string name="nanovolt">Nanovolt</string>
+    <string name="kilovolt">Quilovolt</string>
+    <string name="megavolt">Megavolt</string>
+    <string name="gigavolt">Gigavolt</string>
+    <string name="abvolt">Abvolt</string>
+    <string name="statvolt">Statvolt</string>
+    <string name="watt_ampere">Watt por ampère</string>
+
+
 </resources>

app/src/main/res/values/strings.xml

@@ -85,6 +85,7 @@
     <string name="time">Time</string>
     <string name="torque">Torque</string>
     <string name="volume">Volume</string>
+    <string name="electric_potential">Electric potential</string>
 
     <!-- Area -->
     <string name="sq_kilometre">Sq Kilometre</string>
@@ -265,4 +266,16 @@
     <string name="usd">American Dollar</string>
     <string name="zar">South African Rand</string>
 
+    <!-- Electric Potential -->
+    <string name="volt">Volt</string>
+    <string name="millivolt">Millivolt</string>
+    <string name="microvolt">Microvolt</string>
+    <string name="nanovolt">Nanovolt</string>
+    <string name="kilovolt">Kilovolt</string>
+    <string name="megavolt">Megavolt</string>
+    <string name="gigavolt">Gigavolt</string>
+    <string name="abvolt">Abvolt</string>
+    <string name="statvolt">Statvolt</string>
+    <string name="watt_ampere">Watt per ampere</string>
+
 </resources>