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

Floating calculator should use the same layout as main

Browse Source
This commit is contained in:
serso 2016-04-02 15:25:54 +02:00
parent 5bba39d7b3
commit f577dd77d8
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -74,8 +74,8 @@ public class FloatingCalculatorKeyboard extends BaseFloatingKeyboard {
addButton(row, 0, "7"); addButton(row, 0, "7");
addButton(row, 0, "8"); addButton(row, 0, "8");
addButton(row, 0, "9").setText(up, "π").setText(down, "e"); addButton(row, 0, "9").setText(up, "π").setText(down, "e");
addOperationButton(row, R.id.cpp_kb_button_divide, "/").setText(up, "%").setText(down, "sqrt"); addOperationButton(row, R.id.cpp_kb_button_divide, "/").setText(up, "√").setText(down, "%");
addOperationButton(row, R.id.cpp_kb_button_multiply, "×").setText(up, "^n").setText(down, "^2"); addOperationButton(row, R.id.cpp_kb_button_multiply, "×").setText(up, "^").setText(down, "^2");
addButton(row, R.id.cpp_kb_button_clear, "C"); addButton(row, R.id.cpp_kb_button_clear, "C");
row = makeRow(); row = makeRow();
@ -115,14 +115,14 @@ public class FloatingCalculatorKeyboard extends BaseFloatingKeyboard {
addButton(row, 0, "7"); addButton(row, 0, "7");
addButton(row, 0, "8"); addButton(row, 0, "8");
addButton(row, 0, "9").setText(up, "π").setText(down, "e"); addButton(row, 0, "9").setText(up, "π").setText(down, "e");
addOperationButton(row, R.id.cpp_kb_button_divide, "/").setText(up, "%").setText(down, "sqrt"); addOperationButton(row, R.id.cpp_kb_button_divide, "/").setText(up, "√").setText(down, "%");
addButton(row, 0, parametersCount > 0 ? parameterNames.get(0) : "x"); addButton(row, 0, parametersCount > 0 ? parameterNames.get(0) : "x");
row = makeRow(); row = makeRow();
addButton(row, 0, "4"); addButton(row, 0, "4");
addButton(row, 0, "5"); addButton(row, 0, "5");
addButton(row, 0, "6"); addButton(row, 0, "6");
addOperationButton(row, R.id.cpp_kb_button_multiply, "×").setText(up, "^n").setText(down, "^2"); addOperationButton(row, R.id.cpp_kb_button_multiply, "×").setText(up, "^").setText(down, "^2");
addButton(row, 0, parametersCount > 1 ? parameterNames.get(1) : "y"); addButton(row, 0, parametersCount > 1 ? parameterNames.get(1) : "y");
row = makeRow(); row = makeRow();
@ -229,13 +229,13 @@ public class FloatingCalculatorKeyboard extends BaseFloatingKeyboard {
return false; return false;
} }
switch (text) { switch (text) {
case "sqrt": case "√":
user.insertText("sqrt()", -1); user.insertText("√()", -1);
break; break;
case ",": case ",":
user.insertText(", ", 0); user.insertText(", ", 0);
break; break;
case "^n": case "^":
user.insertOperator('^'); user.insertOperator('^');
break; break;
case "^2": case "^2":