Replace swap and backspace icons with vectors. Fixes #1.

sudonatalie · Apr 22, 2017 · 661947c · 661947c
1 parent c35bf80
commit 661947c
Show file tree

Hide file tree

Showing 10 changed files with 25 additions and 7 deletions.
diff --git 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
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
diff --git a/app/src/main/res/drawable-xhdpi/ic_swap_vert_white.png b/app/src/main/res/drawable-xhdpi/ic_swap_vert_white.png
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
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
diff --git a/app/src/main/res/drawable/ic_backspace_white.xml b/app/src/main/res/drawable/ic_backspace_white.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M22,3L7,3c-0.69,0 -1.23,0.35 -1.59,0.88L0,12l5.41,8.11c0.36,0.53 0.9,0.89 1.59,0.89h15c1.1,0 2,-0.9 2,-2L24,5c0,-1.1 -0.9,-2 -2,-2zM19,15.59L17.59,17 14,13.41 10.41,17 9,15.59 12.59,12 9,8.41 10.41,7 14,10.59 17.59,7 19,8.41 15.41,12 19,15.59z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_swap_vert_white.xml b/app/src/main/res/drawable/ic_swap_vert_white.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="48dp"
+        android:height="48dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M16,17.01V10h-2v7.01h-3L15,21l4,-3.99h-3zM9,3L5,6.99h3V14h2V6.99h3L9,3z"/>
+</vector>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -100,7 +100,8 @@
             <ImageButton
                 android:id="@+id/swap"
                 style="@style/InputButtons"
-                android:src="@drawable/ic_swap_vert_white"/>
+                android:cropToPadding="false"
+                android:src="@drawable/ic_swap_vert_white" />
         </TableRow>
 
         <TableRow android:layout_weight="1">
@@ -161,10 +162,10 @@
                 style="@style/InputButtons"
                 android:text="@string/zero" />
 
-            <Button
+            <ImageButton
                 android:id="@+id/button_back"
                 style="@style/InputButtons"
-                android:text="@string/backspace" />
+                android:src="@drawable/ic_backspace_white"/>
 
             <Button
                 android:id="@+id/button_quarter"

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -17,6 +17,5 @@
     <string name="half">½</string>
 
     <string name="dot">.</string>
-    <string name="backspace">⌫</string>
     <string name="clear">C</string>
 </resources>