Skip to content

Added four buttons #15

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

Added four buttons #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
aa7718e
adding four buttons
Oct 14, 2018
d3ed8d9
added power button
Oct 14, 2018
8810fd6
Finished working on four buttons
Oct 14, 2018
5953d9c
Testing History button
Oct 14, 2018
1003a45
Need to solve history problem
Oct 14, 2018
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
Binary file added .idea/caches/build_file_checksums.ser
View file
Open in desktop
Binary file not shown.
29 changes: 29 additions & 0 deletions .idea/codeStyles/Project.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 0 additions & 22 deletions .idea/compiler.xml
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions .idea/copyright/profiles_settings.xml
View file
Open in desktop

This file was deleted.

15 changes: 10 additions & 5 deletions .idea/misc.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion .idea/modules.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/vcs.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apply plugin: 'com.android.application'

android {
compileSdkVersion 26
buildToolsVersion "26.0.2"
buildToolsVersion '28.0.3'
defaultConfig {
applicationId "tech.iosd.calculaterhacktober"
minSdkVersion 15
Expand Down
188 changes: 179 additions & 9 deletions app/src/main/java/tech/iosd/calculaterhacktober/MainActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,86 @@
package tech.iosd.calculaterhacktober;

import android.content.DialogInterface;
import android.content.Intent;
import android.support.v7.app.AlertDialog;
import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
import android.view.View;
import android.widget.Button;
import android.widget.EditText;
import android.widget.TextView;

import static java.lang.Math.sqrt;


public class MainActivity extends AppCompatActivity {
Button add,sub,div,mul,one,two,three,four,five,six,seven,eight,nine,zero,equal,clear,decimal,clearall,percent,change,sign;
Button add,sub,div,mul,one,two,three,four,five,six,seven,eight,nine,zero,equal,clear,decimal,clearall,percent,change,sign,
pi,root,power,mod,history;

TextView edit2,edit1;
float value1,value2;
float ans=0;
boolean addition,subtraction,division,multiplication,answer;
boolean addition,subtraction,division,multiplication,answer,calcPower,calcMod;

/**
* Zyro
* Added string to save HISTORY
* **/

StringBuilder historyString = new StringBuilder("");


@Override
public boolean onCreateOptionsMenu(Menu menu) {
getMenuInflater().inflate(R.menu.menu_history,menu);
return true;
}

@Override
public boolean onOptionsItemSelected(MenuItem item) {

if(item.getItemId() == R.id.action_history)
{
AlertDialog alertDialog = new AlertDialog.Builder(MainActivity.this).create(); //Read Update
alertDialog.setTitle("History");
alertDialog.setMessage(historyString);
alertDialog.show(); //<-- See This!
}


return true;
}

/**
* Zyro
* Added history button
* **/





@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_main);


/**
* 14th October 2018
* HactoberFest
* Zyro adds four buttons PI,root,power,mod
**/

pi=(Button)findViewById(R.id.pi);
root=(Button)findViewById(R.id.root);
power=(Button)findViewById(R.id.power);
mod=(Button)findViewById(R.id.mod);


add=(Button)findViewById(R.id.add);
sub=(Button)findViewById(R.id.sub);
mul=(Button)findViewById(R.id.mul);
Expand All @@ -44,6 +105,37 @@ protected void onCreate(Bundle savedInstanceState) {
sign= (Button) findViewById(R.id.sign);
// change= (Button) findViewById(R.id.change);

/** Zyro add onCLickListener
*
*/

//What happens on PI?

pi.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
edit1.setText(edit1.getText()+"3.14159");
historyString.append(edit1.getText()+"3.14159"+"\n");
}
});

//What happens on root?

root.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
try{
value1=Float.parseFloat(edit1.getText()+"");

edit1.setText((sqrt(value1))+"");
historyString.append(sqrt(value1)+"\n");
}
catch (Exception e){
edit1.setText("error");
}
}
});

one.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
Expand Down Expand Up @@ -138,18 +230,79 @@ public void onClick(View view) {
edit1.setText("");
}
});

//What happens on power?
power.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {

try {

value1 = Float.parseFloat(edit1.getText() + "");
edit2.setText(edit1.getText() + "^");
historyString.append(edit1.getText() + "^" + "\n");
edit1.setText("");
// ans=Float.parseFloat(edit.getText()+"");
calcPower = true;
addition = false;
subtraction = false;
division = false;
multiplication = false;
calcMod = false;
}
catch (Exception e){
edit1.setText("error");
}

}
});

//What happens on MODULUS?

mod.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
try {

value1 = Float.parseFloat(edit1.getText() + "");
edit2.setText(edit1.getText() + "%");
historyString.append(edit1.getText() + "%"+"\n");
edit1.setText("");
// ans=Float.parseFloat(edit.getText()+"");
calcMod = true;
calcPower = false;
addition = false;
subtraction = false;
division = false;
multiplication = false;
}
catch (Exception e){
edit1.setText("error");
}
}
});

add.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
value1=Float.parseFloat(edit1.getText()+"");
edit2.setText(edit1.getText()+"+");
edit1.setText("");
try {
value1 = Float.parseFloat(edit1.getText() + "");
edit2.setText(edit1.getText() + "+");
historyString.append(edit1.getText() + "+" + "\n");
edit1.setText("");
// ans=Float.parseFloat(edit.getText()+"");
addition=true;
subtraction=false;
division=false;
multiplication=false;
addition = true;
subtraction = false;
division = false;
multiplication = false;
calcPower = false;
calcMod = false;

// edit.setText(null);
}
catch (Exception e){
edit1.setText("error");
}
}
});
sub.setOnClickListener(new View.OnClickListener() {
Expand All @@ -161,9 +314,12 @@ public void onClick(View view) {
addition=false;
division=false;
multiplication=false;
calcPower=false;
calcMod = false;
// edit.setText(null);
value1=Float.parseFloat(edit1.getText()+"");
edit2.setText(edit1.getText()+"-");
historyString.append(edit1.getText()+"-"+"\n");
edit1.setText("");
}
catch (Exception e){
Expand All @@ -180,9 +336,12 @@ public void onClick(View view) {
subtraction=false;
addition=false;
multiplication=false;
calcPower=false;
calcMod = false;
// edit.setText(null);
value1=Float.parseFloat(edit1.getText()+"");
edit2.setText(edit1.getText()+"/");
historyString.append(edit1.getText()+"/"+"\n");
edit1.setText("");
}
catch (Exception e){
Expand All @@ -199,9 +358,12 @@ public void onClick(View view) {
subtraction=false;
division=false;
addition=false;
calcPower=false;
calcMod = false;
// edit.setText(null);
value1=Float.parseFloat(edit1.getText()+"");
edit2.setText(edit1.getText()+"*");
historyString.append(edit1.getText()+"*"+"\n");
edit1.setText("");
}
catch (Exception e){
Expand Down Expand Up @@ -234,7 +396,15 @@ else if(multiplication==true){
//multiplication=false;

}
else if(calcPower==true){
ans = (float)Math.pow(value1,value2);

}
else if(calcMod==true){
ans = value1 % value2;
}
edit1.setText(ans+"");
historyString.append(ans+""+"\n");
}
catch (Exception e){
edit1.setText("error");
Expand Down
Loading