TnSb/android-calculatorpp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move zero back in the middle + E to 6

Browse Source
This commit is contained in:
serso
2016-04-02 17:56:28 +02:00
parent 1a31c5a053
commit 7b59bcec2f
15 changed files with 22 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/org/solovyev/android/calculator/FloatingCalculatorKeyboard.java
View File

@@ -95,7 +95,7 @@ public class FloatingCalculatorKeyboard extends BaseFloatingKeyboard {
addButton(row, 0, "1");
addButton(row, 0, "2");
addButton(row, 0, "3");
addButton(row, 0, "0").setText(up, "00").setText(down, "000");
addButton(row, 0, "0").setText(up, "000").setText(down, "00");
addButton(row, 0, ".").setText(up, ",");
addImageButton(row, R.id.cpp_kb_button_close, R.drawable.ic_done_white_24dp);
}
@@ -133,9 +133,9 @@ public class FloatingCalculatorKeyboard extends BaseFloatingKeyboard {
addImageButton(row, R.id.cpp_kb_button_keyboard, R.drawable.ic_keyboard_white_24dp);
row = makeRow();
addButton(row, 0, "0").setText(up, "00").setText(down, "000");
addButton(row, 0, ".").setText(up, ",");
addButton(row, R.id.cpp_kb_button_brackets, "( )").setText(up, "(").setText(down, ")");
addButton(row, 0, "0").setText(up, "000").setText(down, "00");
addButton(row, 0, ".").setText(up, ",");
addOperationButton(row, R.id.cpp_kb_button_plus, "+");
addImageButton(row, R.id.cpp_kb_button_close, R.drawable.ic_done_white_24dp);
}

5
app/src/main/java/org/solovyev/android/calculator/keyboard/KeyboardUi.java
View File

@@ -161,13 +161,12 @@ public class KeyboardUi extends BaseKeyboardUi {
hideText(button3, down);
hideText(button4, down);
hideText(button5, down);
hideText(button6, up);
hideText(button7, left, up, down);
hideText(button8, left, up, down);
hideText(button9, left);
hideText(multiplicationButton, left);
hideText(plusButton, up, down);
hideText(copyButton, left, up, down);
hideText(pasteButton, left, up, down);
hideText(plusButton, up);
hideText(functionsButton, up, down);
}
multiplicationButton.setText(engine.getMultiplicationSign());