From 661947c473dea4a81d7c8d01693de9f6311c5f1d Mon Sep 17 00:00:00 2001 From: Natalie Perna Date: Fri, 21 Apr 2017 21:58:03 -0400 Subject: [PATCH] Replace swap and backspace icons with vectors. Fixes #1. --- .../cupful/activities/MainActivity.java | 6 +++--- .../main/res/drawable-hdpi/ic_swap_vert_white.png | Bin 252 -> 0 bytes .../main/res/drawable-mdpi/ic_swap_vert_white.png | Bin 202 -> 0 bytes .../res/drawable-xhdpi/ic_swap_vert_white.png | Bin 328 -> 0 bytes .../res/drawable-xxhdpi/ic_swap_vert_white.png | Bin 461 -> 0 bytes .../res/drawable-xxxhdpi/ic_swap_vert_white.png | Bin 632 -> 0 bytes app/src/main/res/drawable/ic_backspace_white.xml | 9 +++++++++ app/src/main/res/drawable/ic_swap_vert_white.xml | 9 +++++++++ app/src/main/res/layout/activity_main.xml | 7 ++++--- app/src/main/res/values/strings.xml | 1 - 10 files changed, 25 insertions(+), 7 deletions(-) delete mode 100644 app/src/main/res/drawable-hdpi/ic_swap_vert_white.png delete mode 100644 app/src/main/res/drawable-mdpi/ic_swap_vert_white.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_swap_vert_white.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_swap_vert_white.png delete mode 100644 app/src/main/res/drawable-xxxhdpi/ic_swap_vert_white.png create mode 100644 app/src/main/res/drawable/ic_backspace_white.xml create mode 100644 app/src/main/res/drawable/ic_swap_vert_white.xml diff --git a/app/src/main/java/com/natalieperna/cupful/activities/MainActivity.java b/app/src/main/java/com/natalieperna/cupful/activities/MainActivity.java index 02acc19..fe1d267 100644 --- a/app/src/main/java/com/natalieperna/cupful/activities/MainActivity.java +++ b/app/src/main/java/com/natalieperna/cupful/activities/MainActivity.java @@ -55,8 +55,8 @@ protected void onCreate(Bundle savedInstanceState) { // Button widgets Button button0, button1, button2, button3, button4, button5, button6, button7, button8, button9; - Button buttonDot, buttonBackspace; - ImageButton buttonSwap; + Button buttonDot; + ImageButton buttonSwap, buttonBackspace; Button buttonQuarter, buttonThird, buttonHalf; // Set up view widgets @@ -79,7 +79,7 @@ protected void onCreate(Bundle savedInstanceState) { button9 = (Button) findViewById(R.id.button_9); buttonDot = (Button) findViewById(R.id.button_dot); - buttonBackspace = (Button) findViewById(R.id.button_back); + buttonBackspace = (ImageButton) findViewById(R.id.button_back); buttonSwap = (ImageButton) findViewById(R.id.swap); buttonQuarter = (Button) findViewById(R.id.button_quarter); diff --git a/app/src/main/res/drawable-hdpi/ic_swap_vert_white.png b/app/src/main/res/drawable-hdpi/ic_swap_vert_white.png deleted file mode 100644 index 33c21c5c46394223f907dd5af09756dd3f86c149..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 252 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY0wn)GsXhaw4tu&dhGg7(d()fiumO+j#WyzR zwnx8P@WIQQ%Wa3}f{>sGas0NH%>vC=N?lyORBLI?v}le?Rm{AyTv1$|*>iGEvPyc` zYE5zVt|hM3XYb7kb=Tc#F;C@g$+oM_mtW`k&E5N2+3x)+8Gm*KhX#gNh9_NYEF1zr zc0~gtBNNLDe&yNimZjg$C8u1L5U)R--BUB^iRD!@<9}iIivKeQ9g#|E7uhO$Gc0_Y z&`*A;phBr78Ruq)1QlupiJfyhbwp8VSDybKP4B(@ACBJydWXT&)z4*}Q$iB}uv=m# diff --git a/app/src/main/res/drawable-mdpi/ic_swap_vert_white.png b/app/src/main/res/drawable-mdpi/ic_swap_vert_white.png deleted file mode 100644 index e22e18866cccd3dbf95abf46905f7b594d727f31..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 202 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}b0DiJmTwArXh)PP67~P!M6cf0j{n z@21w1w-~f8=FRUcZ0}22_F=NA@FUg<0=8e785AmCx`(jw|7|f=j-G$f*zl|IyAwKp zo7B_V>=JU97u{ibH(BFHEj!mAa|dqi1qaxfezj^G;8jS-2Fe*6JCN!1ZNsuu$-}m1 z3Tq}OZx8JeNT@iK_=r{&XS3j3^P6+S5bTulKIthL3a zpSNGnz4*>0QK4w+YS$X}v^%?I-0XO?)0GjZi6MTG*VN5*YsJ@b?t0<;cE$aSlSiZP z>pF%n&4~FDom*IX;r$l(*K6f%9rqT!SoDhj)YASH_OCdax7Tf9@wGZE;rf5sW*@;X z-ghTopY@W!_+)9|v31(NuDy0~+OqQ2xosCy-&ZIozKSVMR(NePUV8g{Lgyfrfc(s=X?cuujvCzP}U63Uj2zrL7w$= L^>bP0l+XkK5r~T2 diff --git a/app/src/main/res/drawable-xxhdpi/ic_swap_vert_white.png b/app/src/main/res/drawable-xxhdpi/ic_swap_vert_white.png deleted file mode 100644 index 6bb0028dd3beb6d7d135ad6ea630ffb5b89a40bd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 461 zcmeAS@N?(olHy`uVBq!ia0vp^6F``Q1xWh(YZ)^zFi!DwaSW-r_4e-0yh8~Bt%3Js zX4jryz0AWtP-T(I5$R(dFXn&VS$1%xfJb?nvF9We5UM)3sH@A#+Fv$aG3#OEk#f^s zJvkR%o6|dT9iO(Ri~8!GEcvLg>(iRWt3%7?`F`1Yta(Liy0r7{lqWZj+U9;#_;qx1 zzv0_WA7qkps%>s|K9cA!)0p{OB)H_rQa_@m3zM1 z<$m37dH&|C z_5ZU%Zb51i9on@P?+$hzb9Q>gw##l*os%11!L;bo^Xczz z7@yx&_>UoQ8t0EjcV;7bK?%nxZ;v^he<;-M^G@kh)$^r~ttNOoHg|5456apR@GR

}^CR>M7aix`@uJQ?h{s?xeU){;CcC4%}S$Vi_=+7(8A5 KT-G@yGywp&z_^$I diff --git a/app/src/main/res/drawable-xxxhdpi/ic_swap_vert_white.png b/app/src/main/res/drawable-xxxhdpi/ic_swap_vert_white.png deleted file mode 100644 index 0a1a6c27b0b59bf57139545592875ef0703f5acf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 632 zcmeAS@N?(olHy`uVBq!ia0vp^2SAvE8Azrw%`pX1Q2{<7u0Z-fZ9t^a_Ps#UWlMtm zf*IbtXy|Y4ZtCl3YwqgonbEakt5%>0PWKmOs zh)be~W5E%|IhTIlPg_;v@ieR>u;Rr1r=(F$MQ-A)wq~m(PZXxb~n< z`Curs)iUNC83ETr80NB-c`_BeQb|Afa+zT1@_P0;%l~RF%dCH{b5$gGnghcnZeR$Y zf&?20Q~@Mj!UbtYBrc3ueS0QRm>6|6qk4vsK_1;~RxTZwrSdZ{bpkE*F$dZZNDz@e=TUGMb$483iRBaP` z^ET~JGWYR?-z=`@>1y!I7nRtrqrvmOUsfb));<}|eD@yK;>X*qudOeax_jFA_N;>a j$vda)|M*)U7VwMw&-_?X<{&BX3FJ&qS3j3^P6 + + diff --git a/app/src/main/res/drawable/ic_swap_vert_white.xml b/app/src/main/res/drawable/ic_swap_vert_white.xml new file mode 100644 index 0000000..1954ff6 --- /dev/null +++ b/app/src/main/res/drawable/ic_swap_vert_white.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 4ff53a3..e1ca905 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -100,7 +100,8 @@ + android:cropToPadding="false" + android:src="@drawable/ic_swap_vert_white" /> @@ -161,10 +162,10 @@ style="@style/InputButtons" android:text="@string/zero" /> -