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 33c21c5..0000000 Binary files a/app/src/main/res/drawable-hdpi/ic_swap_vert_white.png and /dev/null differ 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 e22e188..0000000 Binary files a/app/src/main/res/drawable-mdpi/ic_swap_vert_white.png and /dev/null differ 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 deleted file mode 100644 index a5e55a4..0000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_swap_vert_white.png and /dev/null differ 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 6bb0028..0000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_swap_vert_white.png and /dev/null differ 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 0a1a6c2..0000000 Binary files a/app/src/main/res/drawable-xxxhdpi/ic_swap_vert_white.png and /dev/null differ diff --git a/app/src/main/res/drawable/ic_backspace_white.xml b/app/src/main/res/drawable/ic_backspace_white.xml new file mode 100644 index 0000000..d480b8b --- /dev/null +++ b/app/src/main/res/drawable/ic_backspace_white.xml @@ -0,0 +1,9 @@ + + + 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" /> -