wbrawner/Simple-Calculator
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

implement multiplication

Browse source
This commit is contained in:
tibbi 2015-12-24 22:36:06 +01:00
parent 82521af7b0
commit 3be2aee4d3
1 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
app/src/main/java/calculator/simplemobiletools/com/simple_calculator/MainActivity.java
View file

@ -22,6 +22,7 @@ public class MainActivity extends AppCompatActivity {
private static final int EQUALS = 1;
private static final int PLUS = 2;
private static final int MINUS = 3;
private static final int MULTIPLY = 4;
@Override
protected void onCreate(Bundle savedInstanceState) {
@ -69,6 +70,12 @@ public class MainActivity extends AppCompatActivity {
baseValue = resultValue;
}
private void multiplyNumbers() {
final double resultValue = baseValue * secondValue;
result.setText(Formatter.doubleToString(resultValue));
baseValue = resultValue;
}
private void handleOperation(int operation) {
if (lastKey == operation)
return;
@ -93,6 +100,11 @@ public class MainActivity extends AppCompatActivity {
handleOperation(MINUS);
}
@OnClick(R.id.btn_multiply)
public void multiplyClicked() {
handleOperation(MULTIPLY);
}
@OnClick(R.id.btn_equals)
public void equalsClicked() {
if (lastKey == EQUALS) {
@ -113,6 +125,8 @@ public class MainActivity extends AppCompatActivity {
addNumbers();
else if (lastOperation == MINUS)
subtractNumbers();
else if (lastOperation == MULTIPLY)
multiplyNumbers();
}
@OnClick(R.id.btn_decimal)