From a6cf2d642c0dac4dfb32219a3ffb743964d62932 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kau=C3=AA=20Martins?= Date: Mon, 4 Sep 2017 01:07:46 -0300 Subject: [PATCH 1/2] Electric potential conversion created --- .../unitconverterultimate/MainActivity.java | 27 +++++++++++------- .../models/Conversion.java | 3 +- .../unitconverterultimate/models/Unit.java | 14 ++++++++- .../util/Conversions.java | 17 +++++++++++ .../drawable-hdpi/ic_electric_potential.png | Bin 0 -> 579 bytes .../drawable-mdpi/ic_electric_potential.png | Bin 0 -> 387 bytes .../drawable-xhdpi/ic_electric_potential.png | Bin 0 -> 466 bytes .../drawable-xxhdpi/ic_electric_potential.png | Bin 0 -> 757 bytes .../ic_electric_potential.png | Bin 0 -> 846 bytes .../main/res/menu/menu_navigation_drawer.xml | 5 ++++ app/src/main/res/values/strings.xml | 13 +++++++++ 11 files changed, 66 insertions(+), 13 deletions(-) create mode 100644 app/src/main/res/drawable-hdpi/ic_electric_potential.png create mode 100644 app/src/main/res/drawable-mdpi/ic_electric_potential.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_electric_potential.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_electric_potential.png create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_electric_potential.png 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 0000000000000000000000000000000000000000..865539bb6a50afe41919da87b730c118ad5f32a7 GIT binary patch literal 579 zcmV-J0=)f+P)_|`VtGyO6tu4`UD(E#7|2)(E|F1O8<#MW;O&2 zSM204usv}Hegp4we2xHH67h?`hYFvkGP9e&-Bdc3^!{EY&>z5`GHny!kJ~z+Dd0Kq zvm~N+;4E-D59k4KL(*IsKxWnj+ycCiR#m8Zfy`_#a13aR-M^5ulvTb|h0N?c@Ceu$ z5c?#3Z5|*q+XZ;@>!_j0zI7in^M-m9R_3fzz%^i7#18^L;`fxK?}d)c%#H&Of!zt9 z2}zd&=z`ah0P+m#&eWLCz;dj0Nz!Cdpp(EeU{39$8kcl2fChlEP^dF5^yBY5(FeTSnI?S( zn2mQclI9BmZM0H1f7;hUA)lu_AvVWaA0_z=wPvLrSuGo?1?Wk1-%`3guoV~quIF|8 zcff1lS1miNgO4{}uXp~qtsBtl@Qn>E(U?F!KCYDh2C(tgzaObnXepFZ=r7ZbRQLzd RvTFbU002ovPDHLkV1hI)0+s*( literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..1f2f0c08388d7d8a9646297984e77f9f98bb55c4 GIT binary patch literal 387 zcmV-}0et?6P)Nkl46Y1N0M zo#3}U3xtce3UmUYwYR{vq>FDAB(lT6v-T#bJptSR1Cf|5NlQNgCV`pA;de<>2_W2^ zK41(8&@12xs7X5b-x=gtQ``B6oCnY_samcPdT&sR&iqx1$8B hRr_U@prHIu{|gd2&m%gc-!%XL002ovPDHLkV1hMiqFVp} literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..4689c4291de942bc89ad792d680efbb1525a256d GIT binary patch literal 466 zcmV;@0WJQCP)=Zk}>OfGq zktip*aPjU>@RHMi%iQk%J3E`XO(KTeH01RY0aVRkWT3VT*d76%fZ2c|UnPzIO+)J9TBLLgiKmwv|5x_u+ zsucsaXEIx9Q_^FPO}0KGWcvWvPZfM7X(Ivv2BJcdfv;KXPeyIu0Sf_=^Cqcd3AB9< ztOw*kQpdVqScM{hWEYMMd^Vxj|A6f+U?O0CTar%F{7}=FEFqJB+uh*yODG_G`mm$S>LXORj9~ezY+6q06YMR?$^v35Qo1Je2W%(eH9j3DE2=70=bjkL&l?zZ}N(hhul|{`~1v&5u z_*~Y<#J65D$l$SUlvY3=!v2q$U6}YsEEu4>?*lFaYa?z1NPyCda49IU&m}-p3CP`J zS;x&RWZ!J-WejrnEx@S=g?GR;Gkcm#sIP!_0S_V&o&!hB?5+R_P_qWyT?$HM9s&BV z0lE7+U>mR~HyF0m``#2(-92ovZi=)GeP4{+e>1rMC{p&!%w7%OA4wK-_i*sw5)eR@ z+7~km`{I9@yN8AH(b5hE?T^J4-U9TSt^g&JCO`sI7L3NKpgq7zV0GD;f3==BvmFgV z`UG$=Qnm~T>#<>*2i^|0iigY2nc0nTWwG$FF$}QAnZX}scE178W?*BaY&&oza{o1O z9(Wijdue6?-XAuSELK4^MJ}||NZ=D70V`J8hk#X)&XWhI0;I4)?z4pjci0{1 ze1NLYP;#G5hd2|Y1W15#CsVwh6qKW&@N>wDNU>5asaSW-5dpmc1-_-zt_IhCv zCdVJioNew34;eisu<$VU#)@zX@e9G^E<7r)zwwE zEa$#`7k=B)c=`S7mV0yG-!;r02;-2@mK&-k z?&^D5S>D)M5_4&G*N=@0^HujsS^xOHWA>yx-!q0OKXN_e+gR2moq2Qj-DZXIdi|A? z511)4zBXey6{?h9=_jz9D_@VLg)g=y<^WS$a z(GFy?n{o5#6XvLp%JTQ~L}J_>CYiCQG{#SLWnh}bsWN>zv%mx&g`GCC7nBd&JumjB z#(4AlU>T(a@ebwb_qXTHylKqhqu9{k_J!%vE^AqV1BE4AEIn@G#sZ9nGVbY)2Qo?w znFR$77nV$O);w@Ge%ieHezkAu5Bg@#eSP}zyK)s)9Xex9IfVUqQE*S#7@0shqH%i^U|5(JFyCVcLRi z>2lW_=5_OlKivPIfH&iIC;O-13*4U9rR2-YIgxMq-mhvElhgL< zm!`dMIQGE#vivFQhXGE#lNA>jJ_xE}nZjXuufO3~gZE3p0HrGx_DoXDdQ06MIs+d6 z<;dXqp|Iq+o6b!pCTNf}G^8+{eEO1sMMc;{PyR0Be3iQ%cFUGdt=D>4bbm?qzmS8M z`04~dyE<%A!%2JYD@< J);T3K0RZt6YzY7W literal 0 HcmV?d00001 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"/> + + 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 From a47368cd3488b7ab26c013912fd9233cd082a842 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kau=C3=AA=20Martins?= Date: Mon, 4 Sep 2017 01:27:09 -0300 Subject: [PATCH 2/2] Added brazilian portuguese and spanish translation for the electric potential --- app/src/main/res/values-es/strings.xml | 14 ++++++++++++++ app/src/main/res/values-pt-rBR/strings.xml | 14 ++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 22e93b9a..daa75570 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -85,6 +85,7 @@ 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