From 08dccc68bad34330b7eca19256c1c9d54f269f03 Mon Sep 17 00:00:00 2001 From: tibbi Date: Fri, 25 Dec 2015 14:39:26 +0100 Subject: [PATCH] implement Modulo --- .../com/simple_calculator/MainActivity.java | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/app/src/main/java/calculator/simplemobiletools/com/simple_calculator/MainActivity.java b/app/src/main/java/calculator/simplemobiletools/com/simple_calculator/MainActivity.java index 6029cf2f..b41393f1 100644 --- a/app/src/main/java/calculator/simplemobiletools/com/simple_calculator/MainActivity.java +++ b/app/src/main/java/calculator/simplemobiletools/com/simple_calculator/MainActivity.java @@ -24,6 +24,7 @@ public class MainActivity extends AppCompatActivity { private static final int MINUS = 3; private static final int MULTIPLY = 4; private static final int DIVIDE = 5; + private static final int MODULO = 6; @Override protected void onCreate(Bundle savedInstanceState) { @@ -67,6 +68,14 @@ public class MainActivity extends AppCompatActivity { updateResult(resultValue); } + private void moduloNumbers() { + double resultValue = 0; + if (secondValue != 0) + resultValue = baseValue % secondValue; + + updateResult(resultValue); + } + private void handleOperation(int operation) { if (lastKey == operation) return; @@ -101,6 +110,11 @@ public class MainActivity extends AppCompatActivity { handleOperation(DIVIDE); } + @OnClick(R.id.btn_modulo) + public void moduloClicked() { + handleOperation(MODULO); + } + @OnClick(R.id.btn_equals) public void equalsClicked() { if (lastKey == EQUALS) @@ -147,6 +161,9 @@ public class MainActivity extends AppCompatActivity { case DIVIDE: divideNumbers(); break; + case MODULO: + moduloNumbers(); + break; default: break; }