Skip to content

Uha calculator new #2

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
wants to merge 13 commits into
base: master
Choose a base branch
from
Open

Uha calculator new #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
e6f0c70
Added History button
DracoTempus Sep 26, 2020
7fb8ef2
Made some changes to make it look nicer.
DracoTempus Oct 1, 2020
66fd623
Adding Uha's changes
SBoddeboyina-cx Oct 2, 2020
cf44839
Adding Uha's changes
SBoddeboyina-cx Oct 2, 2020
2441a65
Merge branch 'Uha_Calculator'
DracoTempus Oct 2, 2020
fb1f8ef
Add the ability to square an expression.
ThomasSkowronski Oct 2, 2020
d6e7af1
Merge branch 'master' of https://github.com/DracoTempus/android-calcu…
ThomasSkowronski Oct 2, 2020
d4703fa
added a button to square an expression
ThomasSkowronski Oct 2, 2020
573596e
pushing Main_activity changes
SBoddeboyina-cx Oct 2, 2020
dc46298
added Uha Changes
DracoTempus Oct 2, 2020
3a45088
Fixed exponent I broke
DracoTempus Oct 2, 2020
67d7f75
Add uha changes. Though I see some things that are broken. I fixed …
DracoTempus Oct 2, 2020
e341f24
fixed bug where it uses a wrong variable switch cases in button_Cance…
SBoddeboyina-cx Oct 5, 2020
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
130 changes: 127 additions & 3 deletions app/src/main/java/zone/eloy/projects/androidcalculator/MainActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,16 @@
import android.graphics.PorterDuff;
import android.os.Bundle;
import android.support.v7.app.AppCompatActivity;
import android.util.Log;
import android.view.MotionEvent;
import android.view.View;
import android.widget.Button;
import android.widget.TextView;
import android.widget.Toast;

import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Collections;

import javax.script.ScriptEngine;
import javax.script.ScriptEngineManager;
Expand All @@ -20,6 +23,11 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
{
private int openParenthesis = 0;

private ArrayList<String> history;//Added by MFonggrasin
private String tempTXT = "";//Added by MFonggrasin

private ArrayList<String> cancel;//Added by Uha Sree Budda

private boolean dotUsed = false;

private boolean equalClicked = false;
Expand All @@ -43,6 +51,9 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
Button buttonNumber8;
Button buttonNumber9;

Button buttonHistory;//Added by MFonggrasin
Button buttonCancel;//Added by Uha Sree Budda

Button buttonClear;
Button buttonParentheses;
Button buttonPercent;
Expand All @@ -52,6 +63,7 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
Button buttonAddition;
Button buttonEqual;
Button buttonDot;
Button buttonExponent;

TextView textViewInputNumbers;

Expand All @@ -64,6 +76,9 @@ protected void onCreate(Bundle savedInstanceState)
setContentView(R.layout.activity_main);
scriptEngine = new ScriptEngineManager().getEngineByName("rhino");

cancel = new ArrayList<String>();//Added by Uha Sree Budda
history = new ArrayList<String>();//Added by MFonggrasin

initializeViewVariables();
setOnClickListeners();
setOnTouchListener();
Expand All @@ -82,6 +97,9 @@ private void initializeViewVariables()
buttonNumber8 = (Button) findViewById(R.id.button_eight);
buttonNumber9 = (Button) findViewById(R.id.button_nine);

buttonHistory = (Button) findViewById(R.id.button_history); //Added by MFonggrasin
buttonCancel = (Button) findViewById(R.id.button_CancelPreviousCalculations);//Added by Uha Sree Budda

buttonClear = (Button) findViewById(R.id.button_clear);
buttonParentheses = (Button) findViewById(R.id.button_parentheses);
buttonPercent = (Button) findViewById(R.id.button_percent);
Expand All @@ -91,6 +109,7 @@ private void initializeViewVariables()
buttonAddition = (Button) findViewById(R.id.button_addition);
buttonEqual = (Button) findViewById(R.id.button_equal);
buttonDot = (Button) findViewById(R.id.button_dot);
buttonExponent = (Button) findViewById(R.id.button_exponent);
textViewInputNumbers = (TextView) findViewById(R.id.textView_input_numbers);
}

Expand All @@ -107,6 +126,9 @@ private void setOnClickListeners()
buttonNumber8.setOnClickListener(this);
buttonNumber9.setOnClickListener(this);

buttonHistory.setOnClickListener(this);//Added by MFonggrasin
buttonCancel.setOnClickListener(this);//Added by Uha Sree Budda

buttonClear.setOnClickListener(this);
buttonParentheses.setOnClickListener(this);
buttonPercent.setOnClickListener(this);
Expand All @@ -116,6 +138,7 @@ private void setOnClickListeners()
buttonAddition.setOnClickListener(this);
buttonEqual.setOnClickListener(this);
buttonDot.setOnClickListener(this);
buttonExponent.setOnClickListener(this);
}

private void setOnTouchListener()
Expand All @@ -131,6 +154,9 @@ private void setOnTouchListener()
buttonNumber8.setOnTouchListener(this);
buttonNumber9.setOnTouchListener(this);

buttonHistory.setOnTouchListener(this);//Added by MFonggrasin
buttonCancel.setOnTouchListener(this);//Added by Uha Sree Budda

buttonClear.setOnTouchListener(this);
buttonParentheses.setOnTouchListener(this);
buttonPercent.setOnTouchListener(this);
Expand All @@ -139,77 +165,161 @@ private void setOnTouchListener()
buttonSubtraction.setOnTouchListener(this);
buttonAddition.setOnTouchListener(this);
buttonDot.setOnTouchListener(this);
buttonExponent.setOnTouchListener(this);
}

@Override
public void onClick(View view)
{
if(view.getId() != R.id.button_history){
backHistory(); //Added by MFonggrasin
}
if(view.getId() != R.id.button_CancelPreviousCalculations){
CancelPast(); //Added by MFonggrasin
}

switch (view.getId())
{
case R.id.button_zero:
if (addNumber("0")) equalClicked = false;
break;

case R.id.button_one:
if (addNumber("1")) equalClicked = false;
break;

case R.id.button_two:
if (addNumber("2")) equalClicked = false;
break;

case R.id.button_three:
if (addNumber("3")) equalClicked = false;
break;

case R.id.button_four:
if (addNumber("4")) equalClicked = false;
break;

case R.id.button_five:
if (addNumber("5")) equalClicked = false;
break;

case R.id.button_six:
if (addNumber("6")) equalClicked = false;
break;

case R.id.button_seven:
if (addNumber("7")) equalClicked = false;
break;

case R.id.button_eight:
if (addNumber("8")) equalClicked = false;
break;

case R.id.button_nine:
if (addNumber("9")) equalClicked = false;
break;

case R.id.button_addition:
if (addOperand("+")) equalClicked = false;
break;

case R.id.button_subtraction:
if (addOperand("-")) equalClicked = false;
break;

case R.id.button_multiplication:
if (addOperand("x")) equalClicked = false;
break;
case R.id.button_division:
if (addOperand("\u00F7")) equalClicked = false;

case R.id.button_exponent:
if (addExponent()) equalClicked = false;
break;

case R.id.button_percent:
if (addOperand("%")) equalClicked = false;
break;

case R.id.button_dot:
if (addDot()) equalClicked = false;
break;

case R.id.button_parentheses:
if (addParenthesis()) equalClicked = false;
break;

case R.id.button_division:
if (addOperand("\u00F7")) equalClicked = false;
break;

case R.id.button_CancelPreviousCalculations: //Added by Uha Sree Budda
boolean clear = true;
if(!buttonClear.getText().equals("Clear")){
buttonClear.setText("clear");
tempTXT = textViewInputNumbers.getText().toString();
textViewInputNumbers.setText("");
String clearString = "";
for(String s : cancel){
clearString += s + "\n";
}
textViewInputNumbers.setText(clearString);
clear = false;
}
if(buttonClear.getText().equals("Clear") && clear){
CancelPast();
}

case R.id.button_clear:
textViewInputNumbers.setText("");
openParenthesis = 0;
dotUsed = false;
equalClicked = false;
break;

case R.id.button_history: //Added by MFonggrasin
boolean back = true;
if(!history.isEmpty() && !buttonHistory.getText().equals("Back")){
buttonHistory.setText("Back");
tempTXT = textViewInputNumbers.getText().toString();
Log.d("Testing", "textViewInputNumbers.getText().toString() " + tempTXT);
textViewInputNumbers.setText("");
String historyString = "";
Collections.reverse(history);
for(String s : history){
historyString += s + "\n";
}
Collections.reverse(history);
textViewInputNumbers.setText(historyString);
back = false;
}
if(buttonHistory.getText().equals("Back") && back){
backHistory();
}
break;

case R.id.button_equal:
if (textViewInputNumbers.getText().toString() != null && !textViewInputNumbers.getText().toString().equals(""))
calculate(textViewInputNumbers.getText().toString());
break;
}

}
//Added by Uha Sree Budda
private void CancelPast(){
if(buttonClear.getText().equals("Clear")){
textViewInputNumbers.setText(tempTXT);
buttonClear.setText("Clear");
}
}

//Added by MFonggrasin
private void backHistory(){
if(buttonHistory.getText().equals("Back")){
textViewInputNumbers.setText(tempTXT);
buttonHistory.setText("History");
//textViewInputNumbers.getScrollX();
}
}

@Override
public boolean onTouch(View view, MotionEvent motionEvent)
Expand All @@ -232,6 +342,14 @@ public boolean onTouch(View view, MotionEvent motionEvent)
return false;
}

private boolean addExponent()
{
textViewInputNumbers.setText("("+textViewInputNumbers.getText() + ")x(" + textViewInputNumbers.getText() +")");
calculate(textViewInputNumbers.getText().toString());

return true;
}

private boolean addDot()
{
boolean done = false;
Expand Down Expand Up @@ -418,6 +536,12 @@ private void calculate(String input)
} else if (result.contains("."))
{
result = result.replaceAll("\\.?0*$", "");
if(history.size() > 3){ //Added by MFonggrasin
history.remove(0);
history.add(result);
}else {
history.add(result);
} // End Added by MFonggrasin
textViewInputNumbers.setText(result);
}
}
Expand Down Expand Up @@ -487,7 +611,7 @@ private int defineLastCharacter(String lastCharacter)
{
}

if ((lastCharacter.equals("+") || lastCharacter.equals("-") || lastCharacter.equals("x") || lastCharacter.equals("\u00F7") || lastCharacter.equals("%")))
if ((lastCharacter.equals("+") || lastCharacter.equals("-") || lastCharacter.equals("x") || lastCharacter.equals("\u00F7") || lastCharacter.equals("%") || lastCharacter.equals("\\u00B2")))
return IS_OPERAND;

if (lastCharacter.equals("("))
Expand Down
82 changes: 70 additions & 12 deletions app/src/main/res/layout/activity_main.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,23 +10,81 @@


<LinearLayout
android:layout_marginTop="0.1dp"
android:layout_marginLeft="0.9dp"
android:layout_marginRight="0.1dp"
android:background="@android:color/black"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="3">
android:layout_marginLeft="0.9dp"
android:layout_marginTop="0.1dp"
android:layout_marginRight="0.1dp"
android:layout_weight="3"
android:background="@android:color/black">

<TextView
android:id="@+id/textView_input_numbers"
android:layout_marginTop="25dp"
<ScrollView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginRight="10dp"
android:gravity="end"
android:layout_height="match_parent">

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical" >

<TextView
android:id="@+id/textView_input_numbers"
android:layout_width="match_parent"
android:layout_height="217dp"
android:layout_marginTop="25dp"
android:layout_marginRight="10dp"
android:gravity="end"
android:textColor="@android:color/holo_red_light"
android:textSize="40sp" />
</LinearLayout>
</ScrollView>

</LinearLayout>

<LinearLayout
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_weight="1"
android:orientation="horizontal">

<Button
android:id="@+id/button_history"
android:layout_width="90dp"
android:layout_height="match_parent"
android:layout_marginLeft="0.9dp"
android:layout_marginTop="0.1dp"
android:layout_marginRight="0.1dp"
android:layout_weight="1"
android:background="@android:color/black"
android:text="History"
android:textColor="@android:color/holo_red_light"
android:textSize="40sp" />
android:textSize="30sp" />

<Button
android:id="@+id/button_CancelPreviousCalculations"
android:layout_width="14dp"
android:layout_height="match_parent"
android:layout_marginLeft="0.9dp"
android:layout_marginTop="0.1dp"
android:layout_marginRight="0.1dp"
android:layout_weight="1"
android:background="@android:color/black"
android:text="Cancel"
android:textColor="@android:color/holo_red_light"
android:textSize="30sp" />

<Button
android:id="@+id/button_exponent"
android:layout_width="4dp"
android:layout_height="match_parent"
android:layout_marginLeft="0.9dp"
android:layout_marginTop="0.1dp"
android:layout_marginRight="0.1dp"
android:layout_weight="1"
android:background="@android:color/black"
android:text="x\u00b2"
android:textColor="@android:color/holo_red_light"
android:textSize="30sp" />

</LinearLayout>

Expand Down
Loading