fenix
/
Simple-Calculator
mirror of https://github.com/SimpleMobileTools/Simple-Calculator.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

create a common function for getting the displayed number

This commit is contained in:
tibbi 2015-12-24 16:48:44 +01:00
parent 576520dc3a
commit 0c1f8257c9
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/calculator/simplemobiletools/com/simple_calculator/MainActivity.java
View File

@ -22,7 +22,7 @@ public class MainActivity extends AppCompatActivity {
} }
private void addDigit(int number) { private void addDigit(int number) {
final String currentValue = result.getText().toString(); final String currentValue = getDisplayedNumber();
final String newValue = getFormattedValue(currentValue + number); final String newValue = getFormattedValue(currentValue + number);
result.setText(newValue); result.setText(newValue);
} }
@ -41,9 +41,13 @@ public class MainActivity extends AppCompatActivity {
} }
} }
private String getDisplayedNumber() {
return result.getText().toString();
}
@OnClick(R.id.btn_decimal) @OnClick(R.id.btn_decimal)
public void decimalClicked() { public void decimalClicked() {
String value = result.getText().toString(); String value = getDisplayedNumber();
if (!value.contains(".")) if (!value.contains("."))
value += "."; value += ".";
result.setText(value); result.setText(value);
@ -51,7 +55,7 @@ public class MainActivity extends AppCompatActivity {
@OnClick(R.id.btn_0) @OnClick(R.id.btn_0)
public void zeroClicked() { public void zeroClicked() {
String value = result.getText().toString(); String value = getDisplayedNumber();
if (!value.isEmpty() && !value.equals("0")) if (!value.isEmpty() && !value.equals("0"))
value += "0"; value += "0";
result.setText(value); result.setText(value);