Skip to content

Added Mod Function to the Calculator #35

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
imaryandokania wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Added Mod Function to the Calculator #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions app/src/main/java/com/exuberant/calci/HomeActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ protected void onCreate(Bundle savedInstanceState) {
findViewById(R.id.btn_two).setOnClickListener(this);
findViewById(R.id.btn_three).setOnClickListener(this);
findViewById(R.id.btn_four).setOnClickListener(this);
findViewById(R.id.btn_mod).setOnClickListener(this);
findViewById(R.id.btn_five).setOnClickListener(this);
findViewById(R.id.btn_six).setOnClickListener(this);
findViewById(R.id.btn_seven).setOnClickListener(this);
Expand Down Expand Up @@ -51,15 +52,18 @@ public void onClick(View view) {
case R.id.btn_division :
case R.id.btn_multiplication :
case R.id.btn_subtraction :

handleOperatorClick(button.getText().toString());
break;

//Handling clear button

case R.id.btn_clear:
currentNumber = "";
totalCalculation = "";
break;


//Handle calculation
case R.id.btn_equals:
totalCalculation += currentNumber;
Expand Down Expand Up @@ -103,6 +107,7 @@ private double mul(double a, double b){
private double div(double a, double b){
return a / b;
}
private double mod(double a,double b) {return a % b; }

private void calculateAnswer(){
//Use totalCalculation string to get final answer and display it
Expand Down
3 changes: 2 additions & 1 deletion app/src/main/res/layout/activity_home.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,10 @@

<include
android:id="@+id/answer_view"
layout="@layout/content_answer_view"
android:layout_width="match_parent"
android:layout_height="0dp"
layout="@layout/content_answer_view"
android:background="#615D5D"
app:layout_constraintBottom_toTopOf="@+id/divider"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
Expand Down
15 changes: 8 additions & 7 deletions app/src/main/res/layout/content_answer_view.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,27 +6,28 @@

<TextView
android:id="@+id/tv_total_calculation"
android:layout_marginEnd="16dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="16dp"
android:layout_marginEnd="16dp"
android:background="#F8F5F5"
android:gravity="end"
android:textSize="24sp"
android:text="@string/total_calculation"
android:textColor="#757575"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
android:textSize="24sp" />


<TextView
android:id="@+id/tv_current_calculation"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="16dp"
android:gravity="end"
android:textSize="32sp"
android:text="@string/current_calculation"
android:textColor="#757575"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
android:textSize="32sp" />

</LinearLayout>
55 changes: 35 additions & 20 deletions app/src/main/res/layout/content_number_board.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,34 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:onClick="onClick"
android:orientation="vertical">

<com.google.android.material.button.MaterialButton
android:id="@+id/btn_mod"
style="@style/CalculatorKeys"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:backgroundTint="@color/colorOperatorKey"
android:onClick="onClick"
android:text="%"
android:textColor="@android:color/white"
app:layout_constraintBottom_toTopOf="@+id/btn_equals"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/btn_addition" />

<com.google.android.material.button.MaterialButton
android:id="@+id/btn_clear"
android:text="C"
android:backgroundTint="@color/colorClearKey"
style="@style/CalculatorKeys"
android:layout_marginTop="16dp"
android:alpha="0.8"
android:backgroundTint="@color/colorClearKey"
android:text="C"
android:textColor="#F19CD6"
app:layout_constraintBottom_toTopOf="@+id/btn_seven"
app:layout_constraintEnd_toStartOf="@+id/btn_opening_brace"
app:layout_constraintHorizontal_bias="0.5"
android:textColor="#F19CD6"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

Expand All @@ -33,8 +48,8 @@

<com.google.android.material.button.MaterialButton
android:id="@+id/btn_closing_brace"
android:text=")"
style="@style/CalculatorKeys"
android:text=")"
app:layout_constraintBottom_toBottomOf="@+id/btn_opening_brace"
app:layout_constraintEnd_toStartOf="@+id/btn_division"
app:layout_constraintHorizontal_bias="0.5"
Expand All @@ -43,10 +58,10 @@

<com.google.android.material.button.MaterialButton
android:id="@+id/btn_division"
style="@style/CalculatorKeys"
android:backgroundTint="@color/colorOperatorKey"
android:text="/"
android:textColor="@android:color/white"
android:backgroundTint="@color/colorOperatorKey"
style="@style/CalculatorKeys"
app:layout_constraintBottom_toBottomOf="@+id/btn_closing_brace"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5"
Expand All @@ -56,8 +71,8 @@

<com.google.android.material.button.MaterialButton
android:id="@+id/btn_seven"
android:text="7"
style="@style/CalculatorKeys"
android:text="7"
app:layout_constraintBottom_toTopOf="@+id/btn_four"
app:layout_constraintEnd_toStartOf="@+id/btn_eight"
app:layout_constraintHorizontal_bias="0.5"
Expand All @@ -66,30 +81,30 @@

<com.google.android.material.button.MaterialButton
android:id="@+id/btn_eight"
android:text="8"
style="@style/CalculatorKeys"
android:text="8"
app:layout_constraintBottom_toBottomOf="@+id/btn_seven"
app:layout_constraintEnd_toStartOf="@+id/btn_nine"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toEndOf="@+id/btn_seven"
app:layout_constraintTop_toTopOf="@+id/btn_seven" />

<com.google.android.material.button.MaterialButton
android:text="9"
android:id="@+id/btn_nine"
style="@style/CalculatorKeys"
android:text="9"
app:layout_constraintBottom_toBottomOf="@+id/btn_eight"
app:layout_constraintEnd_toStartOf="@+id/btn_multiplication"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toEndOf="@+id/btn_eight"
app:layout_constraintTop_toTopOf="@+id/btn_eight" />

<com.google.android.material.button.MaterialButton
android:text="X"
android:textColor="@android:color/white"
android:backgroundTint="@color/colorOperatorKey"
android:id="@+id/btn_multiplication"
style="@style/CalculatorKeys"
android:backgroundTint="@color/colorOperatorKey"
android:text="X"
android:textColor="@android:color/white"
app:layout_constraintBottom_toBottomOf="@+id/btn_nine"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5"
Expand All @@ -98,8 +113,8 @@

<com.google.android.material.button.MaterialButton
android:id="@+id/btn_four"
android:text="4"
style="@style/CalculatorKeys"
android:text="4"
app:layout_constraintBottom_toTopOf="@+id/btn_one"
app:layout_constraintEnd_toStartOf="@+id/btn_five"
app:layout_constraintHorizontal_bias="0.5"
Expand All @@ -108,8 +123,8 @@

<com.google.android.material.button.MaterialButton
android:id="@+id/btn_five"
android:text="5"
style="@style/CalculatorKeys"
android:text="5"
app:layout_constraintBottom_toBottomOf="@+id/btn_four"
app:layout_constraintEnd_toStartOf="@+id/btn_six"
app:layout_constraintHorizontal_bias="0.5"
Expand All @@ -118,8 +133,8 @@

<com.google.android.material.button.MaterialButton
android:id="@+id/btn_six"
android:text="6"
style="@style/CalculatorKeys"
android:text="6"
app:layout_constraintBottom_toBottomOf="@+id/btn_five"
app:layout_constraintEnd_toStartOf="@+id/btn_subtraction"
app:layout_constraintHorizontal_bias="0.5"
Expand All @@ -129,9 +144,9 @@
<com.google.android.material.button.MaterialButton
android:id="@+id/btn_subtraction"
style="@style/CalculatorKeys"
android:backgroundTint="@color/colorOperatorKey"
android:text="-"
android:textColor="@android:color/white"
android:backgroundTint="@color/colorOperatorKey"
app:layout_constraintBottom_toBottomOf="@+id/btn_six"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5"
Expand All @@ -140,8 +155,8 @@

<com.google.android.material.button.MaterialButton
android:id="@+id/btn_one"
android:text="1"
style="@style/CalculatorKeys"
android:text="1"
app:layout_constraintBottom_toTopOf="@+id/btn_zero"
app:layout_constraintEnd_toStartOf="@+id/btn_two"
app:layout_constraintHorizontal_bias="0.5"
Expand All @@ -150,8 +165,8 @@

<com.google.android.material.button.MaterialButton
android:id="@+id/btn_two"
android:text="2"
style="@style/CalculatorKeys"
android:text="2"
app:layout_constraintBottom_toBottomOf="@+id/btn_one"
app:layout_constraintEnd_toStartOf="@+id/btn_three"
app:layout_constraintHorizontal_bias="0.5"
Expand All @@ -171,9 +186,9 @@
<com.google.android.material.button.MaterialButton
android:id="@+id/btn_addition"
style="@style/CalculatorKeys"
android:backgroundTint="@color/colorOperatorKey"
android:text="+"
android:textColor="@android:color/white"
android:backgroundTint="@color/colorOperatorKey"
app:layout_constraintBottom_toBottomOf="@+id/btn_three"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5"
Expand Down Expand Up @@ -205,9 +220,9 @@
<com.google.android.material.button.MaterialButton
android:id="@+id/btn_equals"
style="@style/CalculatorKeys"
android:backgroundTint="@color/colorEqualKey"
android:text="="
android:textColor="@android:color/white"
android:backgroundTint="@color/colorEqualKey"
app:layout_constraintBottom_toBottomOf="@+id/btn_point"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5"
Expand Down