From b56d7e8d678caadd7beb326beb677b7ca1b50492 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edmar=20Gon=C3=A7alves?= Date: Sun, 23 Aug 2015 14:53:28 -0700 Subject: [PATCH] Committing UI improvements and more. --- .idea/encodings.xml | 7 +++-- .idea/gradle.xml | 6 ++-- .idea/misc.xml | 29 ++++++++++++++++-- .idea/modules.xml | 4 +-- .idea/vcs.xml | 4 +-- BasicUnitConverter.iml | 21 ------------- app/app.iml | 11 +++++-- app/src/main/AndroidManifest.xml | 2 +- .../converters/helper/AbstractConverter.java | 5 +-- .../main/res/drawable-hdpi/ic_calculator.png | Bin 0 -> 586 bytes .../main/res/drawable-mdpi/ic_calculator.png | Bin 0 -> 476 bytes app/src/main/res/drawable-v21/ripple.xml | 5 +++ .../main/res/drawable-xhdpi/ic_calculator.png | Bin 0 -> 789 bytes .../res/drawable-xxhdpi/ic_calculator.png | Bin 0 -> 1090 bytes app/src/main/res/drawable/circularButton.xml | 13 ++++++++ app/src/main/res/drawable/ripple.xml | 13 ++++++++ app/src/main/res/drawable/roundButton.xml | 9 ++++++ .../res/layout/activity_area_converter.xml | 10 +++--- .../layout/activity_basic_unit_converter.xml | 14 ++++----- .../res/layout/activity_length_converter.xml | 24 ++++++++------- .../layout/activity_temperature_converter.xml | 24 ++++++++------- .../res/layout/activity_time_converter.xml | 10 +++--- .../res/layout/activity_volume_converter.xml | 24 ++++++++------- .../res/layout/activity_weight_converter.xml | 24 ++++++++------- app/src/main/res/values/colors.xml | 1 + app/src/main/res/xml/preferences.xml | 6 ++++ basicunitconverterandroidapp.iml | 8 ++--- build.gradle | 2 +- commons-lang3-3.3.2/commons-lang3-3.3.2.iml | 18 ++++++++--- 29 files changed, 186 insertions(+), 108 deletions(-) delete mode 100644 BasicUnitConverter.iml create mode 100644 app/src/main/res/drawable-hdpi/ic_calculator.png create mode 100644 app/src/main/res/drawable-mdpi/ic_calculator.png create mode 100644 app/src/main/res/drawable-v21/ripple.xml create mode 100644 app/src/main/res/drawable-xhdpi/ic_calculator.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_calculator.png create mode 100644 app/src/main/res/drawable/circularButton.xml create mode 100644 app/src/main/res/drawable/ripple.xml create mode 100644 app/src/main/res/drawable/roundButton.xml diff --git a/.idea/encodings.xml b/.idea/encodings.xml index e206d70..f758959 100644 --- a/.idea/encodings.xml +++ b/.idea/encodings.xml @@ -1,5 +1,6 @@ - - - + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml index f3b5e8b..941ee53 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -5,7 +5,8 @@ - - + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 2497215..fc2d64b 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -3,8 +3,31 @@ - + + + + + - - + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml index 2cca456..0089bbf 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -2,11 +2,9 @@ - - - + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml index def6a6a..a6929d6 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -2,6 +2,6 @@ + - - + \ No newline at end of file diff --git a/BasicUnitConverter.iml b/BasicUnitConverter.iml deleted file mode 100644 index 5550340..0000000 --- a/BasicUnitConverter.iml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/app/app.iml b/app/app.iml index ccfb277..e88ce5f 100644 --- a/app/app.iml +++ b/app/app.iml @@ -26,7 +26,7 @@ - + @@ -71,6 +71,9 @@ + + + @@ -86,8 +89,12 @@ - + + + + + \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index c245fc7..7eb7bc0 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -33,7 +33,7 @@ android:parentActivityName=".BasicUnitConverterActivity" android:theme="@style/TemperatureTheme" android:windowSoftInputMode="stateVisible|adjustResize" - android:icon="@drawable/ic_thermometer"> + android:icon="@drawable/ic_temperature"> Vq9ZCg3HUlXtI(8_7imrh{o=nO^fkZ?df}py1D1#0{2%?9Cq7DW^dXNgd zDtO8N$=<*lcnlK~HnY1l4?cAEn_2y-J3H=rJf=*UGUeDB3*$4 zu#DRlu-`nk8DW(HVww)(n5qDE;93K9RRLUoB6EF!0d zf(sG1FB$uU?or|n$k>qJW>f`e0r!Lkab2KDTveD&s>BtsKX(mbzb!M3{t%!IJP_WA z>*1%&T}^l+HR7sditXcm=ziO(0?Z07Ok7qn_66Ou#AV6Yu;Av*Ec9Oj_=lW{%jn8O z&cxaRurBfeG-N0PK>;1YwOhwzLis7bR!Z7Ph$y zlBKwrg-if91rRUpipM~JI7>JNEaC#f-_ccF7k6E`8g=~*4m)o#vDb~88-1osnR0f0 Y164!;eHFzUwEzGB07*qoM6N<$f(4HGO8@`> literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-mdpi/ic_calculator.png b/app/src/main/res/drawable-mdpi/ic_calculator.png new file mode 100644 index 0000000000000000000000000000000000000000..c4d53f38c1c0ac5e45f4071c195cbc1fa988731e GIT binary patch literal 476 zcmV<20VDp2P)4};$qp7a*}#yflaS6l>kf+OkBI6@yon&x1F3^N2+Oc!NjnH46jPJ7d)nTC zci}?xf@6>d2jB!OO*6nLh=Fsk4Qy}*w!j+L2P@MIu)*1@nXhuz zM_?Hoay4w7068w94mq6wCJ7Z_2)ZMW<$!K5#`WliIsr1mUDGGoSDWvd#ORW&xf0_t zMm8ZnUx3a?-MwPObyThBTRH(!!WFf| zoe&$&CBb8u;87D0tC8;4F^_=Q+>4r?kL6Z%Lt^F!%ukLC0Bui6h8dKbQ> S2}K?N0000 + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable-xhdpi/ic_calculator.png b/app/src/main/res/drawable-xhdpi/ic_calculator.png new file mode 100644 index 0000000000000000000000000000000000000000..7d306da8e5acb3fd8d81d1be78ca13e9fa188a92 GIT binary patch literal 789 zcmV+w1M2*VP)sX!AJxNl4&v2K&6(W zs0?D0_&+_*f%D*SxcB9vdH3Gt9QcBs`FQ8v@A&54ci!ph($LV*(9qD(_)Elb+y{CM zIsu(|suP-HUpov~^myS?i|sIAHy{Ic+hM>#Kn5ISVZaN}0O+b?4bWUNH=y9r7j(ge z0r`J0<|WW|re4bTi2P;B=Rnt3{tD&up&IZJv;dl?UFHMjBhVYlqw1h;&{NPV%l|+V zLN?$leyZ%8QKg^DpxcbA)2ENu`dyY^2i;Hu0yf}1s6xVj?K0(G(c+TVKGP*I4f@3L z-^jRN4Zub9GIg`pcs|GSJu>ggfFX~z!66q0;J5ZLUaO8ZY`9O!#DI=J3abHXKpgMU zZE~VR1M>&e5ZtkWI~GiX{#J5_g4=Utz?6Z(!%C4czxjbiRF`UutC^}ekh?=;BwUei ziHv*T%{c(__ZhR5GG4?Nmcnf_Zo zag~&U$r0mbEZnFI1AbCbVvZ>?Y;l`{nWNiXxpkEd+@@ixj07`JbJ2s48j!I8_D!z%+$L0{-zKGAo>_SO_k zjfx$TYZ$nuV7xNGh139_48TWJk3o-^o`8M{ZbdMtS#e@)QBHCzJ{vG%;U0>jY0kox z828q~V2yEK&jD(H8sMb?1q(OHnC+DDmKe8`!tF3_(!w}tk}|c)-J(VZepnhew6=|i zh3!yIa^o~c!r|CAeQA^HxQbB6x5{>Wvot=?Tn?aJez`5}@){Z%8X6iJ|6QB|LTwK2 TXRBO300000NkvXXu0mjfDWQFh literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/ic_calculator.png b/app/src/main/res/drawable-xxhdpi/ic_calculator.png new file mode 100644 index 0000000000000000000000000000000000000000..32f91acd467a03e06230b1a45234d5615f43a515 GIT binary patch literal 1090 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7Ro>VBz$1aSW-r^>*%EZ;?QWW3iVP zgt};+xZ8APcT9J{>qFfa)_EQ3$xzha)UuC7m`A5;+Zo-C6AM%{G&apH;kIv@l=9K( zW%2L%+rA&zZ6I^sxOhTAS=u~yxe0G;pPiXG|CnX^`7Pb2g1_~ju0K~8U-DOmtlsJU@7azW?@#(~nblqMXD@@o z_S%-)t1j8etJ^=HUp|5R+iw_cKi+?dq5qo@~=TnO?c%(U;Vs&1Q|4ve&KJui);h z{j)2eTLEXCqFlSSi>6V+slw} zZPQ)Gg=dSW-Hc>(u*vZjggQbXmO)dVfhQvEISYfS*v@SVj2_V`{L*UqU&U^&nJ{&x}bN8FZchyQ}!Hso?>-B z@tyFsrVU~&VDkgMG1N^~KQWyr>^A##-kbVQ1fBhIcg-r>DRDVQIo18gjb%$e7f$~? z_W{rs4QEe1F+BW2^X0@~>qqlAZ?3!)=RbYTt@l5jPkhTMV%?U*xFs?ryY=CdJ7PXZ ziVl6)dQGXE!CNq*3m%*wSPD)Qr3SGZ^}8fadQS1lm6FeUyv^QEI=lNx8qemN7nnG@fawkd9{gvD zcw&8XGTZVW&oVSu&pUoI>BQTIv!5^?U++DZWAAx~F7mvv4F FO#lvr=N$k5 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable/circularButton.xml b/app/src/main/res/drawable/circularButton.xml new file mode 100644 index 0000000..ae85128 --- /dev/null +++ b/app/src/main/res/drawable/circularButton.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ripple.xml b/app/src/main/res/drawable/ripple.xml new file mode 100644 index 0000000..ac2d44b --- /dev/null +++ b/app/src/main/res/drawable/ripple.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/roundButton.xml b/app/src/main/res/drawable/roundButton.xml new file mode 100644 index 0000000..1b71b49 --- /dev/null +++ b/app/src/main/res/drawable/roundButton.xml @@ -0,0 +1,9 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_area_converter.xml b/app/src/main/res/layout/activity_area_converter.xml index 9920c4b..8209c9b 100644 --- a/app/src/main/res/layout/activity_area_converter.xml +++ b/app/src/main/res/layout/activity_area_converter.xml @@ -55,17 +55,19 @@ android:prompt="@string/from_prompt" /> -