From 85834f6cfb01e99400fdec00e4f34ddc0742ddb8 Mon Sep 17 00:00:00 2001 From: tashsmit Date: Thu, 21 May 2015 19:09:53 -0400 Subject: [PATCH] new fork --- Calculator.iml | 19 + app/.gitignore | 1 + app/app.iml | 90 ++ app/build.gradle | 24 + app/proguard-rules.pro | 17 + .../c4q/nyc/calc/ApplicationTest.java | 13 + app/src/main/AndroidManifest.xml | 21 + .../gmsyrimis/c4q/nyc/calc/Expression.java | 1144 +++++++++++++++++ .../gmsyrimis/c4q/nyc/calc/MainActivity.java | 537 ++++++++ app/src/main/res/drawable/selector_button.xml | 24 + .../main/res/drawable/selector_button2.xml | 24 + .../main/res/layout-land/activity_main.xml | 271 ++++ .../main/res/layout-port/activity_main.xml | 176 +++ app/src/main/res/layout/mytitle.xml | 9 + app/src/main/res/menu/menu_main.xml | 5 + app/src/main/res/mipmap-hdpi/ic_launcher.png | Bin 0 -> 3418 bytes app/src/main/res/mipmap-mdpi/ic_launcher.png | Bin 0 -> 2206 bytes app/src/main/res/mipmap-xhdpi/ic_launcher.png | Bin 0 -> 4842 bytes .../main/res/mipmap-xxhdpi/ic_launcher.png | Bin 0 -> 7718 bytes .../res/mipmap-xxhdpi/math_background.jpg | Bin 0 -> 153942 bytes app/src/main/res/values-v21/styles.xml | 5 + app/src/main/res/values-w820dp/dimens.xml | 6 + app/src/main/res/values/colors.xml | 5 + app/src/main/res/values/dimens.xml | 5 + app/src/main/res/values/strings.xml | 6 + app/src/main/res/values/styles.xml | 40 + app/src/main/res/values/themes.xml | 6 + build.gradle | 19 + build/intermediates/model_data.bin | Bin 0 -> 66452 bytes gradle.properties | 18 + gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 49896 bytes gradle/wrapper/gradle-wrapper.properties | 6 + gradlew | 164 +++ gradlew.bat | 90 ++ local.properties | 11 + settings.gradle | 1 + 36 files changed, 2757 insertions(+) create mode 100644 Calculator.iml create mode 100644 app/.gitignore create mode 100644 app/app.iml create mode 100644 app/build.gradle create mode 100644 app/proguard-rules.pro create mode 100644 app/src/androidTest/java/gmsyrimis/c4q/nyc/calc/ApplicationTest.java create mode 100644 app/src/main/AndroidManifest.xml create mode 100644 app/src/main/java/gmsyrimis/c4q/nyc/calc/Expression.java create mode 100644 app/src/main/java/gmsyrimis/c4q/nyc/calc/MainActivity.java create mode 100644 app/src/main/res/drawable/selector_button.xml create mode 100644 app/src/main/res/drawable/selector_button2.xml create mode 100644 app/src/main/res/layout-land/activity_main.xml create mode 100644 app/src/main/res/layout-port/activity_main.xml create mode 100644 app/src/main/res/layout/mytitle.xml create mode 100644 app/src/main/res/menu/menu_main.xml create mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher.png create mode 100644 app/src/main/res/mipmap-mdpi/ic_launcher.png create mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher.png create mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher.png create mode 100644 app/src/main/res/mipmap-xxhdpi/math_background.jpg create mode 100644 app/src/main/res/values-v21/styles.xml create mode 100644 app/src/main/res/values-w820dp/dimens.xml create mode 100644 app/src/main/res/values/colors.xml create mode 100644 app/src/main/res/values/dimens.xml create mode 100644 app/src/main/res/values/strings.xml create mode 100644 app/src/main/res/values/styles.xml create mode 100644 app/src/main/res/values/themes.xml create mode 100644 build.gradle create mode 100644 build/intermediates/model_data.bin create mode 100644 gradle.properties create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100755 gradlew create mode 100644 gradlew.bat create mode 100644 local.properties create mode 100644 settings.gradle diff --git a/Calculator.iml b/Calculator.iml new file mode 100644 index 0000000..0bb6048 --- /dev/null +++ b/Calculator.iml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + diff --git a/app/.gitignore b/app/.gitignore new file mode 100644 index 0000000..796b96d --- /dev/null +++ b/app/.gitignore @@ -0,0 +1 @@ +/build diff --git a/app/app.iml b/app/app.iml new file mode 100644 index 0000000..2a4e04c --- /dev/null +++ b/app/app.iml @@ -0,0 +1,90 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/build.gradle b/app/build.gradle new file mode 100644 index 0000000..33873f1 --- /dev/null +++ b/app/build.gradle @@ -0,0 +1,24 @@ +apply plugin: 'com.android.application' + +android { + compileSdkVersion 22 + buildToolsVersion "22.0.1" + + defaultConfig { + applicationId "gmsyrimis.c4q.nyc.calc" + minSdkVersion 21 + targetSdkVersion 22 + versionCode 1 + versionName "1.0" + } + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + } + } +} + +dependencies { + compile fileTree(dir: 'libs', include: ['*.jar']) +} diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro new file mode 100644 index 0000000..d1a0a9b --- /dev/null +++ b/app/proguard-rules.pro @@ -0,0 +1,17 @@ +# Add project specific ProGuard rules here. +# By default, the flags in this file are appended to flags specified +# in /Users/c4q-george/Library/Android/sdk/tools/proguard/proguard-android.txt +# You can edit the include path and order by changing the proguardFiles +# directive in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# Add any project specific keep options here: + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} diff --git a/app/src/androidTest/java/gmsyrimis/c4q/nyc/calc/ApplicationTest.java b/app/src/androidTest/java/gmsyrimis/c4q/nyc/calc/ApplicationTest.java new file mode 100644 index 0000000..5a15a91 --- /dev/null +++ b/app/src/androidTest/java/gmsyrimis/c4q/nyc/calc/ApplicationTest.java @@ -0,0 +1,13 @@ +package gmsyrimis.c4q.nyc.calc; + +import android.app.Application; +import android.test.ApplicationTestCase; + +/** + * Testing Fundamentals + */ +public class ApplicationTest extends ApplicationTestCase { + public ApplicationTest() { + super(Application.class); + } +} \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000..9e29a98 --- /dev/null +++ b/app/src/main/AndroidManifest.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + diff --git a/app/src/main/java/gmsyrimis/c4q/nyc/calc/Expression.java b/app/src/main/java/gmsyrimis/c4q/nyc/calc/Expression.java new file mode 100644 index 0000000..8141f69 --- /dev/null +++ b/app/src/main/java/gmsyrimis/c4q/nyc/calc/Expression.java @@ -0,0 +1,1144 @@ +/* + * Copyright 2012 Udo Klimaschewski + * + * http://UdoJava.com/ + * http://about.me/udo.klimaschewski + * + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE + * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + */ +package gmsyrimis.c4q.nyc.calc; + +import java.math.BigDecimal; +import java.math.BigInteger; +import java.math.MathContext; +import java.math.RoundingMode; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Stack; + +/** + *

EvalEx - Java Expression Evaluator

+ * + *

Introduction

+ * EvalEx is a handy expression evaluator for Java, that allows to evaluate simple mathematical and boolean expressions. + *
+ * Key Features: + * + *
+ *

Examples

+ * 
+ *  BigDecimal result = null;
+ *
+ *  Expression expression = new Expression("1+1/3");
+ *  result = expression.eval():
+ *  expression.setPrecision(2);
+ *  result = expression.eval():
+ *
+ *  result = new Expression("(3.4 + -4.1)/2").eval();
+ *
+ *  result = new Expression("SQRT(a^2 + b^2").with("a","2.4").and("b","9.253").eval();
+ *
+ *  BigDecimal a = new BigDecimal("2.4");
+ *  BigDecimal b = new BigDecimal("9.235");
+ *  result = new Expression("SQRT(a^2 + b^2").with("a",a).and("b",b).eval();
+ *
+ *  result = new Expression("2.4/PI").setPrecision(128).setRoundingMode(RoundingMode.UP).eval();
+ *
+ *  result = new Expression("random() > 0.5").eval();
+ *
+ *  result = new Expression("not(x<7 || sqrt(max(x,9)) <= 3))").with("x","22.9").eval();
+ *
+ *
+ *

Supported Operators

+ * + * + * + * + * + * + * + * + * + *
Mathematical Operators
OperatorDescription
+Additive operator
-Subtraction operator
*Multiplication operator
/Division operator
%Remainder operator (Modulo)
^Power operator
+ *
+ * + * + * + * + * + * + * + * + * + * + * + * + * + *
Boolean Operators*
OperatorDescription
=Equals
==Equals
!=Not equals
<>Not equals
<Less than
<=Less than or equal to
>Greater than
>=Greater than or equal to
&&Boolean and
||Boolean or
+ * *Boolean operators result always in a BigDecimal value of 1 or 0 (zero). Any non-zero value is treated as a _true_ value. Boolean _not_ is implemented by a function. + *
+ *

Supported Functions

+ * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + *
Function*Description
NOT(expression)Boolean negation, 1 (means true) if the expression is not zero
IF(condition,value_if_true,value_if_false)Returns one value if the condition evaluates to true or the other if it evaluates to false
RANDOM()Produces a random number between 0 and 1
MIN(e1,e2)Returns the smaller of both expressions
MAX(e1,e2)Returns the bigger of both expressions
ABS(expression)Returns the absolute (non-negative) value of the expression
ROUND(expression,precision)Rounds a value to a certain number of digits, uses the current rounding mode
FLOOR(expression)Rounds the value down to the nearest integer
CEILING(expression)Rounds the value up to the nearest integer
LOG(expression)Returns the natural logarithm (base e) of an expression
LOG10(expression)Returns the common logarithm (base 10) of an expression
SQRT(expression)Returns the square root of an expression
SIN(expression)Returns the trigonometric sine of an angle (in degrees)
COS(expression)Returns the trigonometric cosine of an angle (in degrees)
TAN(expression)Returns the trigonometric tangens of an angle (in degrees)
ASIN(expression)Returns the angle of asin (in degrees)
ACOS(expression)Returns the angle of acos (in degrees)
ATAN(expression)Returns the angle of atan (in degrees)
SINH(expression)Returns the hyperbolic sine of a value
COSH(expression)Returns the hyperbolic cosine of a value
TANH(expression)Returns the hyperbolic tangens of a value
RAD(expression)Converts an angle measured in degrees to an approximately equivalent angle measured in radians
DEG(expression)Converts an angle measured in radians to an approximately equivalent angle measured in degrees
+ * *Functions names are case insensitive. + *
+ *

Supported Constants

+ * + * + * + * + * + *
ConstantDescription
PIThe value of PI, exact to 100 digits
TRUEThe value one
FALSEThe value zero
+ * + *

Add Custom Operators

+ * + * Custom operators can be added easily, simply create an instance of `Expression.Operator` and add it to the expression. + * Parameters are the operator string, its precedence and if it is left associative. The operators `eval()` method will be called with the BigDecimal values of the operands. + * All existing operators can also be overridden. + *
+ * For example, add an operator `x >> n`, that moves the decimal point of _x_ _n_ digits to the right: + * + * 
+ * Expression e = new Expression("2.1234 >> 2");
+ *
+ * e.addOperator(e.new Operator(">>", 30, true) {
+ *     {@literal @}Override
+ *     public BigDecimal eval(BigDecimal v1, BigDecimal v2) {
+ *         return v1.movePointRight(v2.toBigInteger().intValue());
+ *     }
+ * });
+ *
+ * e.eval(); // returns 212.34
+ *
+ *
+ *

Add Custom Functions

+ * + * Adding custom functions is as easy as adding custom operators. Create an instance of `Expression.Function`and add it to the expression. + * Parameters are the function name and the count of required parameters. The functions `eval()` method will be called with a list of the BigDecimal parameters. + * All existing functions can also be overridden. + *
+ * For example, add a function `average(a,b,c)`, that will calculate the average value of a, b and c: + *
+ * 
+ * Expression e = new Expression("2 * average(12,4,8)");
+ *
+ * e.addFunction(e.new Function("average", 3) {
+ *     {@literal @}Override
+ *     public BigDecimal eval(List parameters) {
+ *         BigDecimal sum = parameters.get(0).add(parameters.get(1)).add(parameters.get(2));
+ *         return sum.divide(new BigDecimal(3));
+ *     }
+ * });
+ *
+ * e.eval(); // returns 16
+ *
+ * The software is licensed under the MIT Open Source license (see LICENSE file). + *
+ * + * + *@author Udo Klimaschewski (http://about.me/udo.klimaschewski) + */ +public class Expression { + + /** + * Definition of PI as a constant, can be used in expressions as variable. + */ + public static final BigDecimal PI = new BigDecimal( + "3.1415926535897932384626433832795028841971693993751058209749445923078164062862089986280348253421170679"); + + public static final BigDecimal E = new BigDecimal( + "2.7182818284590452353602874713527"); + + /** + * The {@link MathContext} to use for calculations. + */ + private MathContext mc = MathContext.DECIMAL32; + + /** + * The original infix expression. + */ + private String expression = null; + + /** + * The cached RPN (Reverse Polish Notation) of the expression. + */ + private List rpn = null; + + /** + * All defined operators with name and implementation. + */ + private Map operators = new HashMap(); + + /** + * All defined functions with name and implementation. + */ + private Map functions = new HashMap(); + + /** + * All defined variables with name and value. + */ + private Map variables = new HashMap(); + + /** + * What character to use for decimal separators. + */ + private final char decimalSeparator = '.'; + + /** + * What character to use for minus sign (negative values). + */ + private final char minusSign = '-'; + + /** + * The expression evaluators exception class. + */ + public class ExpressionException extends RuntimeException { + private static final long serialVersionUID = 1118142866870779047L; + + public ExpressionException(String message) { + super(message); + } + } + + /** + * Abstract definition of a supported expression function. A function is + * defined by a name, the number of parameters and the actual processing + * implementation. + */ + public abstract class Function { + /** + * Name of this function. + */ + private String name; + /** + * Number of parameters expected for this function. + */ + private int numParams; + + /** + * Creates a new function with given name and parameter count. + * + * @param name + * The name of the function. + * @param numParams + * The number of parameters for this function. + */ + public Function(String name, int numParams) { + this.name = name.toUpperCase(); + this.numParams = numParams; + } + + public String getName() { + return name; + } + + public int getNumParams() { + return numParams; + } + + /** + * Implementation for this function. + * + * @param parameters + * Parameters will be passed by the expression evaluator as a + * {@link List} of {@link BigDecimal} values. + * @return The function must return a new {@link BigDecimal} value as a + * computing result. + */ + public abstract BigDecimal eval(List parameters); + } + + /** + * Abstract definition of a supported operator. An operator is defined by + * its name (pattern), precedence and if it is left- or right associative. + */ + public abstract class Operator { + /** + * This operators name (pattern). + */ + private String oper; + /** + * Operators precedence. + */ + private int precedence; + /** + * Operator is left associative. + */ + private boolean leftAssoc; + + /** + * Creates a new operator. + * + * @param oper + * The operator name (pattern). + * @param precedence + * The operators precedence. + * @param leftAssoc + * true if the operator is left associative, + * else false. + */ + public Operator(String oper, int precedence, boolean leftAssoc) { + this.oper = oper; + this.precedence = precedence; + this.leftAssoc = leftAssoc; + } + + public String getOper() { + return oper; + } + + public int getPrecedence() { + return precedence; + } + + public boolean isLeftAssoc() { + return leftAssoc; + } + + /** + * Implementation for this operator. + * + * @param v1 + * Operand 1. + * @param v2 + * Operand 2. + * @return The result of the operation. + */ + public abstract BigDecimal eval(BigDecimal v1, BigDecimal v2); + } + + /** + * Expression tokenizer that allows to iterate over a {@link String} + * expression token by token. Blank characters will be skipped. + */ + private class Tokenizer implements Iterator { + + /** + * Actual position in expression string. + */ + private int pos = 0; + + /** + * The original input expression. + */ + private String input; + /** + * The previous token or null if none. + */ + private String previousToken; + + /** + * Creates a new tokenizer for an expression. + * + * @param input + * The expression string. + */ + public Tokenizer(String input) { + this.input = input.trim(); + } + + @Override + public boolean hasNext() { + return (pos < input.length()); + } + + /** + * Peek at the next character, without advancing the iterator. + * + * @return The next character or character 0, if at end of string. + */ + private char peekNextChar() { + if (pos < (input.length() - 1)) { + return input.charAt(pos + 1); + } else { + return 0; + } + } + + @Override + public String next() { + StringBuilder token = new StringBuilder(); + if (pos >= input.length()) { + return previousToken = null; + } + char ch = input.charAt(pos); + while (Character.isWhitespace(ch) && pos < input.length()) { + ch = input.charAt(++pos); + } + if (Character.isDigit(ch)) { + while ((Character.isDigit(ch) || ch == decimalSeparator) + && (pos < input.length())) { + token.append(input.charAt(pos++)); + ch = pos == input.length() ? 0 : input.charAt(pos); + } + } else if (ch == minusSign + && Character.isDigit(peekNextChar()) + && ("(".equals(previousToken) || ",".equals(previousToken) + || previousToken == null || operators + .containsKey(previousToken))) { + token.append(minusSign); + pos++; + token.append(next()); + } else if (Character.isLetter(ch) || (ch == '_')) { + while ((Character.isLetter(ch) || Character.isDigit(ch) || (ch == '_')) && (pos < input.length())) { + token.append(input.charAt(pos++)); + ch = pos == input.length() ? 0 : input.charAt(pos); + } + } else if (ch == '(' || ch == ')' || ch == ',') { + token.append(ch); + pos++; + } else { + while (!Character.isLetter(ch) && !Character.isDigit(ch) && ch != '_' + && !Character.isWhitespace(ch) && ch != '(' + && ch != ')' && ch != ',' && (pos < input.length())) { + token.append(input.charAt(pos)); + pos++; + ch = pos == input.length() ? 0 : input.charAt(pos); + if (ch == minusSign) { + break; + } + } + if (!operators.containsKey(token.toString())) { + throw new ExpressionException("Unknown operator '" + token + + "' at position " + (pos - token.length() + 1)); + } + } + return previousToken = token.toString(); + } + + @Override + public void remove() { + throw new ExpressionException("remove() not supported"); + } + + /** + * Get the actual character position in the string. + * + * @return The actual character position. + */ + public int getPos() { + return pos; + } + + } + + /** + * Creates a new expression instance from an expression string. + * + * @param expression + * The expression. E.g. "2.4*sin(3)/(2-4)" or + * "sin(y)>0 & max(z, 3)>3" + */ + public Expression(String expression) { + this.expression = expression; + addOperator(new Operator("+", 20, true) { + @Override + public BigDecimal eval(BigDecimal v1, BigDecimal v2) { + return v1.add(v2, mc); + } + }); + addOperator(new Operator("-", 20, true) { + @Override + public BigDecimal eval(BigDecimal v1, BigDecimal v2) { + return v1.subtract(v2, mc); + } + }); + addOperator(new Operator("*", 30, true) { + @Override + public BigDecimal eval(BigDecimal v1, BigDecimal v2) { + return v1.multiply(v2, mc); + } + }); + addOperator(new Operator("/", 30, true) { + @Override + public BigDecimal eval(BigDecimal v1, BigDecimal v2) { + return v1.divide(v2, mc); + } + }); + addOperator(new Operator("%", 30, true) { + @Override + public BigDecimal eval(BigDecimal v1, BigDecimal v2) { + return v1.remainder(v2, mc); + } + }); + addOperator(new Operator("^", 40, false) { + @Override + public BigDecimal eval(BigDecimal v1, BigDecimal v2) { + /*- + * Thanks to Gene Marin: + * http://stackoverflow.com/questions/3579779/how-to-do-a-fractional-power-on-bigdecimal-in-java + */ + int signOf2 = v2.signum(); + double dn1 = v1.doubleValue(); + v2 = v2.multiply(new BigDecimal(signOf2)); // n2 is now positive + BigDecimal remainderOf2 = v2.remainder(BigDecimal.ONE); + BigDecimal n2IntPart = v2.subtract(remainderOf2); + BigDecimal intPow = v1.pow(n2IntPart.intValueExact(), mc); + BigDecimal doublePow = new BigDecimal(Math.pow(dn1, + remainderOf2.doubleValue())); + + BigDecimal result = intPow.multiply(doublePow, mc); + if (signOf2 == -1) { + result = BigDecimal.ONE.divide(result, mc.getPrecision(), + RoundingMode.HALF_UP); + } + return result; + } + }); + addOperator(new Operator("&&", 4, false) { + @Override + public BigDecimal eval(BigDecimal v1, BigDecimal v2) { + boolean b1 = !v1.equals(BigDecimal.ZERO); + boolean b2 = !v2.equals(BigDecimal.ZERO); + return b1 && b2 ? BigDecimal.ONE : BigDecimal.ZERO; + } + }); + + addOperator(new Operator("||", 2, false) { + @Override + public BigDecimal eval(BigDecimal v1, BigDecimal v2) { + boolean b1 = !v1.equals(BigDecimal.ZERO); + boolean b2 = !v2.equals(BigDecimal.ZERO); + return b1 || b2 ? BigDecimal.ONE : BigDecimal.ZERO; + } + }); + + addOperator(new Operator(">", 10, false) { + @Override + public BigDecimal eval(BigDecimal v1, BigDecimal v2) { + return v1.compareTo(v2) == 1 ? BigDecimal.ONE : BigDecimal.ZERO; + } + }); + + addOperator(new Operator(">=", 10, false) { + @Override + public BigDecimal eval(BigDecimal v1, BigDecimal v2) { + return v1.compareTo(v2) >= 0 ? BigDecimal.ONE : BigDecimal.ZERO; + } + }); + + addOperator(new Operator("<", 10, false) { + @Override + public BigDecimal eval(BigDecimal v1, BigDecimal v2) { + return v1.compareTo(v2) == -1 ? BigDecimal.ONE + : BigDecimal.ZERO; + } + }); + + addOperator(new Operator("<=", 10, false) { + @Override + public BigDecimal eval(BigDecimal v1, BigDecimal v2) { + return v1.compareTo(v2) <= 0 ? BigDecimal.ONE : BigDecimal.ZERO; + } + }); + + addOperator(new Operator("=", 7, false) { + @Override + public BigDecimal eval(BigDecimal v1, BigDecimal v2) { + return v1.compareTo(v2) == 0 ? BigDecimal.ONE : BigDecimal.ZERO; + } + }); + addOperator(new Operator("==", 7, false) { + @Override + public BigDecimal eval(BigDecimal v1, BigDecimal v2) { + return operators.get("=").eval(v1, v2); + } + }); + + addOperator(new Operator("!=", 7, false) { + @Override + public BigDecimal eval(BigDecimal v1, BigDecimal v2) { + return v1.compareTo(v2) != 0 ? BigDecimal.ONE : BigDecimal.ZERO; + } + }); + addOperator(new Operator("<>", 7, false) { + @Override + public BigDecimal eval(BigDecimal v1, BigDecimal v2) { + return operators.get("!=").eval(v1, v2); + } + }); + + addFunction(new Function("NOT", 1) { + @Override + public BigDecimal eval(List parameters) { + boolean zero = parameters.get(0).compareTo(BigDecimal.ZERO) == 0; + return zero ? BigDecimal.ONE : BigDecimal.ZERO; + } + }); + + addFunction(new Function("IF", 3) { + @Override + public BigDecimal eval(List parameters) { + boolean isTrue = !parameters.get(0).equals(BigDecimal.ZERO); + return isTrue ? parameters.get(1) : parameters.get(2); + } + }); + + addFunction(new Function("RANDOM", 0) { + @Override + public BigDecimal eval(List parameters) { + double d = Math.random(); + return new BigDecimal(d, mc); + } + }); + addFunction(new Function("SIN", 1) { + @Override + public BigDecimal eval(List parameters) { + double d = Math.sin(Math.toRadians(parameters.get(0) + .doubleValue())); + return new BigDecimal(d, mc); + } + }); + addFunction(new Function("COS", 1) { + @Override + public BigDecimal eval(List parameters) { + double d = Math.cos(Math.toRadians(parameters.get(0) + .doubleValue())); + return new BigDecimal(d, mc); + } + }); + addFunction(new Function("TAN", 1) { + @Override + public BigDecimal eval(List parameters) { + double d = Math.tan(Math.toRadians(parameters.get(0) + .doubleValue())); + return new BigDecimal(d, mc); + } + }); + addFunction(new Function("ASIN", 1) { // added by av + @Override + public BigDecimal eval(List parameters) { + double d = Math.toDegrees(Math.asin(parameters.get(0) + .doubleValue())); + return new BigDecimal(d, mc); + } + }); + addFunction(new Function("ACOS", 1) { // added by av + @Override + public BigDecimal eval(List parameters) { + double d = Math.toDegrees(Math.acos(parameters.get(0) + .doubleValue())); + return new BigDecimal(d, mc); + } + }); + addFunction(new Function("ATAN", 1) { // added by av + @Override + public BigDecimal eval(List parameters) { + double d = Math.toDegrees(Math.atan(parameters.get(0) + .doubleValue())); + return new BigDecimal(d, mc); + } + }); + addFunction(new Function("SINH", 1) { + @Override + public BigDecimal eval(List parameters) { + double d = Math.sinh(parameters.get(0).doubleValue()); + return new BigDecimal(d, mc); + } + }); + addFunction(new Function("COSH", 1) { + @Override + public BigDecimal eval(List parameters) { + double d = Math.cosh(parameters.get(0).doubleValue()); + return new BigDecimal(d, mc); + } + }); + addFunction(new Function("TANH", 1) { + @Override + public BigDecimal eval(List parameters) { + double d = Math.tanh(parameters.get(0).doubleValue()); + return new BigDecimal(d, mc); + } + }); + addFunction(new Function("RAD", 1) { + @Override + public BigDecimal eval(List parameters) { + double d = Math.toRadians(parameters.get(0).doubleValue()); + return new BigDecimal(d, mc); + } + }); + addFunction(new Function("DEG", 1) { + @Override + public BigDecimal eval(List parameters) { + double d = Math.toDegrees(parameters.get(0).doubleValue()); + return new BigDecimal(d, mc); + } + }); + addFunction(new Function("MAX", 2) { + @Override + public BigDecimal eval(List parameters) { + BigDecimal v1 = parameters.get(0); + BigDecimal v2 = parameters.get(1); + return v1.compareTo(v2) > 0 ? v1 : v2; + } + }); + addFunction(new Function("MIN", 2) { + @Override + public BigDecimal eval(List parameters) { + BigDecimal v1 = parameters.get(0); + BigDecimal v2 = parameters.get(1); + return v1.compareTo(v2) < 0 ? v1 : v2; + } + }); + addFunction(new Function("ABS", 1) { + @Override + public BigDecimal eval(List parameters) { + return parameters.get(0).abs(mc); + } + }); + addFunction(new Function("LOG", 1) { + @Override + public BigDecimal eval(List parameters) { + double d = Math.log(parameters.get(0).doubleValue()); + return new BigDecimal(d, mc); + } + }); + + addFunction(new Function("!", 1) { + @Override + public BigDecimal eval(List parameters) { + double result = 1; + double n = parameters.get(0).doubleValue(); + for (int i = 1; i <= n; i++) { + result = result * i; + } + return new BigDecimal(result, mc); + } + }); + + addFunction(new Function("LOG10", 1) { + @Override + public BigDecimal eval(List parameters) { + double d = Math.log10(parameters.get(0).doubleValue()); + return new BigDecimal(d, mc); + } + }); + addFunction(new Function("ROUND", 2) { + @Override + public BigDecimal eval(List parameters) { + BigDecimal toRound = parameters.get(0); + int precision = parameters.get(1).intValue(); + return toRound.setScale(precision, mc.getRoundingMode()); + } + }); + addFunction(new Function("FLOOR", 1) { + @Override + public BigDecimal eval(List parameters) { + BigDecimal toRound = parameters.get(0); + return toRound.setScale(0, RoundingMode.FLOOR); + } + }); + addFunction(new Function("CEILING", 1) { + @Override + public BigDecimal eval(List parameters) { + BigDecimal toRound = parameters.get(0); + return toRound.setScale(0, RoundingMode.CEILING); + } + }); + addFunction(new Function("SQRT", 1) { + @Override + public BigDecimal eval(List parameters) { + /* + * From The Java Programmers Guide To numerical Computing + * (Ronald Mak, 2003) + */ + BigDecimal x = parameters.get(0); + if (x.compareTo(BigDecimal.ZERO) == 0) { + return new BigDecimal(0); + } + if (x.signum() < 0) { + throw new ExpressionException( + "Argument to SQRT() function must not be negative"); + } + BigInteger n = x.movePointRight(mc.getPrecision() << 1) + .toBigInteger(); + + int bits = (n.bitLength() + 1) >> 1; + BigInteger ix = n.shiftRight(bits); + BigInteger ixPrev; + + do { + ixPrev = ix; + ix = ix.add(n.divide(ix)).shiftRight(1); + // Give other threads a chance to work; + Thread.yield(); + } while (ix.compareTo(ixPrev) != 0); + + return new BigDecimal(ix, mc.getPrecision()); + } + }); + + + + variables.put("PI", PI); + variables.put("E", E ); + variables.put("TRUE", BigDecimal.ONE); + variables.put("FALSE", BigDecimal.ZERO); + + } + + /** + * Is the string a number? + * + * @param st + * The string. + * @return true, if the input string is a number. + */ + private boolean isNumber(String st) { + if (st.charAt(0) == minusSign && st.length() == 1) + return false; + for (char ch : st.toCharArray()) { + if (!Character.isDigit(ch) && ch != minusSign + && ch != decimalSeparator) + return false; + } + return true; + } + + /** + * Implementation of the Shunting Yard algorithm to transform an + * infix expression to a RPN expression. + * + * @param expression + * The input expression in infx. + * @return A RPN representation of the expression, with each token as a list + * member. + */ + private List shuntingYard(String expression) { + List outputQueue = new ArrayList(); + Stack stack = new Stack(); + + Tokenizer tokenizer = new Tokenizer(expression); + + String lastFunction = null; + String previousToken = null; + while (tokenizer.hasNext()) { + String token = tokenizer.next(); + if (isNumber(token)) { + outputQueue.add(token); + } else if (variables.containsKey(token)) { + outputQueue.add(token); + } else if (functions.containsKey(token.toUpperCase())) { + stack.push(token); + lastFunction = token; + } else if (Character.isLetter(token.charAt(0))) { + stack.push(token); + } else if (",".equals(token)) { + while (!stack.isEmpty() && !"(".equals(stack.peek())) { + outputQueue.add(stack.pop()); + } + if (stack.isEmpty()) { + throw new ExpressionException("Parse error for function '" + + lastFunction + "'"); + } + } else if (operators.containsKey(token)) { + Operator o1 = operators.get(token); + String token2 = stack.isEmpty() ? null : stack.peek(); + while (operators.containsKey(token2) + && ((o1.isLeftAssoc() && o1.getPrecedence() <= operators + .get(token2).getPrecedence()) || (o1 + .getPrecedence() < operators.get(token2) + .getPrecedence()))) { + outputQueue.add(stack.pop()); + token2 = stack.isEmpty() ? null : stack.peek(); + } + stack.push(token); + } else if ("(".equals(token)) { + if (previousToken != null) { + if (isNumber(previousToken)) { + throw new ExpressionException("Missing operator at character position " + tokenizer.getPos()); + } + } + stack.push(token); + } else if (")".equals(token)) { + while (!stack.isEmpty() && !"(".equals(stack.peek())) { + outputQueue.add(stack.pop()); + } + if (stack.isEmpty()) { + throw new RuntimeException("Mismatched parentheses"); + } + stack.pop(); + if (!stack.isEmpty() + && functions.containsKey(stack.peek().toUpperCase())) { + outputQueue.add(stack.pop()); + } + } + previousToken = token; + } + while (!stack.isEmpty()) { + String element = stack.pop(); + if ("(".equals(element) || ")".equals(element)) { + throw new RuntimeException("Mismatched parentheses"); + } + if (!operators.containsKey(element)) { + throw new RuntimeException("Unknown operator or function: " + + element); + } + outputQueue.add(element); + } + return outputQueue; + } + + /** + * Evaluates the expression. + * + * @return The result of the expression. + */ + public BigDecimal eval() { + + Stack stack = new Stack(); + + for (String token : getRPN()) { + if (operators.containsKey(token)) { + BigDecimal v1 = stack.pop(); + BigDecimal v2 = stack.pop(); + stack.push(operators.get(token).eval(v2, v1)); + } else if (variables.containsKey(token)) { + stack.push(variables.get(token).round(mc)); + } else if (functions.containsKey(token.toUpperCase())) { + Function f = functions.get(token.toUpperCase()); + ArrayList p = new ArrayList( + f.getNumParams()); + for (int i = 0; i < f.numParams; i++) { + p.add(0,stack.pop()); + } + BigDecimal fResult = f.eval(p); + stack.push(fResult); + } else { + stack.push(new BigDecimal(token, mc)); + } + } + return stack.pop().stripTrailingZeros(); + } + + /** + * Sets the precision for expression evaluation. + * + * @param precision + * The new precision. + * + * @return The expression, allows to chain methods. + */ + public Expression setPrecision(int precision) { + this.mc = new MathContext(precision); + return this; + } + + /** + * Sets the rounding mode for expression evaluation. + * + * @param roundingMode + * The new rounding mode. + * @return The expression, allows to chain methods. + */ + public Expression setRoundingMode(RoundingMode roundingMode) { + this.mc = new MathContext(mc.getPrecision(), roundingMode); + return this; + } + + /** + * Adds an operator to the list of supported operators. + * + * @param operator + * The operator to add. + * @return The previous operator with that name, or null if + * there was none. + */ + public Operator addOperator(Operator operator) { + return operators.put(operator.getOper(), operator); + } + + /** + * Adds a function to the list of supported functions + * + * @param function + * The function to add. + * @return The previous operator with that name, or null if + * there was none. + */ + public Function addFunction(Function function) { + return functions.put(function.getName(), function); + } + + /** + * Sets a variable value. + * + * @param variable + * The variable name. + * @param value + * The variable value. + * @return The expression, allows to chain methods. + */ + public Expression setVariable(String variable, BigDecimal value) { + variables.put(variable, value); + return this; + } + + /** + * Sets a variable value. + * + * @param variable + * The variable to set. + * @param value + * The variable value. + * @return The expression, allows to chain methods. + */ + public Expression setVariable(String variable, String value) { + if (isNumber(value)) + variables.put(variable, new BigDecimal(value)); + else { + expression = expression.replaceAll("\\b" + variable + "\\b", "(" + value + ")"); + rpn = null; + } + return this; + } + + /** + * Sets a variable value. + * + * @param variable + * The variable to set. + * @param value + * The variable value. + * @return The expression, allows to chain methods. + */ + public Expression with(String variable, BigDecimal value) { + return setVariable(variable, value); + } + + /** + * Sets a variable value. + * + * @param variable + * The variable to set. + * @param value + * The variable value. + * @return The expression, allows to chain methods. + */ + public Expression and(String variable, String value) { + return setVariable(variable, value); + } + + /** + * Sets a variable value. + * + * @param variable + * The variable to set. + * @param value + * The variable value. + * @return The expression, allows to chain methods. + */ + public Expression and(String variable, BigDecimal value) { + return setVariable(variable, value); + } + + /** + * Sets a variable value. + * + * @param variable + * The variable to set. + * @param value + * The variable value. + * @return The expression, allows to chain methods. + */ + public Expression with(String variable, String value) { + return setVariable(variable, value); + } + + /** + * Get an iterator for this expression, allows iterating over an expression + * token by token. + * + * @return A new iterator instance for this expression. + */ + public Iterator getExpressionTokenizer() { + return new Tokenizer(this.expression); + } + + /** + * Cached access to the RPN notation of this expression, ensures only one + * calculation of the RPN per expression instance. If no cached instance + * exists, a new one will be created and put to the cache. + * + * @return The cached RPN instance. + */ + private List getRPN() { + if (rpn == null) { + rpn = shuntingYard(this.expression); + } + return rpn; + } + + /** + * Get a string representation of the RPN (Reverse Polish Notation) for this + * expression. + * + * @return A string with the RPN representation for this expression. + */ + public String toRPN() { + String result = new String(); + for (String st : getRPN()) { + result = result.isEmpty() ? result : result + " "; + result += st; + } + return result; + } + +} diff --git a/app/src/main/java/gmsyrimis/c4q/nyc/calc/MainActivity.java b/app/src/main/java/gmsyrimis/c4q/nyc/calc/MainActivity.java new file mode 100644 index 0000000..f409c87 --- /dev/null +++ b/app/src/main/java/gmsyrimis/c4q/nyc/calc/MainActivity.java @@ -0,0 +1,537 @@ +package gmsyrimis.c4q.nyc.calc; + +import android.app.Activity; +import android.content.res.Configuration; +import android.os.Bundle; +import android.util.AndroidRuntimeException; +import android.view.Menu; +import android.view.MenuItem; +import android.view.View; +import android.view.Window; +import android.widget.Button; +import android.widget.TextView; + +import java.math.BigDecimal; +import java.util.List; + + +public class MainActivity extends Activity { + + // Standard Calc + Button multiply; + Button plus; + Button minus; + Button divide; + Button one; + Button two; + Button three; + Button four; + Button five; + Button six; + Button seven; + Button eight; + Button nine; + Button zero; + Button clear; + Button equalsBtn; + Button bksp; + Button rightParenthesis; + Button leftParenthesis; + Button decimal; + // Sci calc + Button factorial; + Button sqrt; + Button percentage; + Button sin; + Button cos; + Button tan; + Button rd; + Button log; + Button oneOverX; + Button eX; + Button xSquared; + Button yToX; + Button absolute; + Button pi; + Button e; + + TextView calculate; + + boolean lastPressed_Equals =false; + boolean radians = true; + + static final String STATE_DISPLAY = "Calculator Display"; + + + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + + setContentView(R.layout.activity_main); + + + //show that calc is in radians mode + getActionBar().setTitle("Tasha & George Awesome Calculator"); + + calculate = (TextView) findViewById(R.id.calculate); + + if (savedInstanceState != null) { + calculate.setText(savedInstanceState.getString(STATE_DISPLAY)); + } + + multiply = (Button) findViewById(R.id.multiply_btn); + multiply.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (lastPressed_Equals==true||calculate.getText().toString().equals("ERROR")){ + calculate.setText(""); + } + calculate.append("*"); + lastPressed_Equals=false; + } + }); + divide =(Button) findViewById(R.id.division_btn); + divide.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (lastPressed_Equals==true||calculate.getText().toString().equals("ERROR")){ + calculate.setText(""); + } + calculate.append("/"); + lastPressed_Equals=false; + } + }); + plus = (Button) findViewById(R.id.plus_btn); + plus.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (lastPressed_Equals==true||calculate.getText().toString().equals("ERROR")){ + calculate.setText(""); + } + calculate.append("+"); + lastPressed_Equals=false; + } + }); + minus = (Button) findViewById(R.id.minus_btn); + minus.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (lastPressed_Equals==true||calculate.getText().toString().equals("ERROR")){ + calculate.setText(""); + } + calculate.append("-"); + lastPressed_Equals=false; + } + }); + one = (Button) findViewById(R.id.one_btn); + one.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (lastPressed_Equals==true||calculate.getText().toString().equals("ERROR")){ + calculate.setText(""); + } + calculate.append("1"); + lastPressed_Equals=false; + } + }); + two = (Button) findViewById(R.id.two_btn); + two.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (lastPressed_Equals==true||calculate.getText().toString().equals("ERROR")){ + calculate.setText(""); + } + calculate.append("2"); + lastPressed_Equals=false; + } + }); + three = (Button) findViewById(R.id.three_btn); + three.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (lastPressed_Equals==true||calculate.getText().toString().equals("ERROR")){ + calculate.setText(""); + } + calculate.append("3"); + lastPressed_Equals=false; + } + }); + four= (Button) findViewById(R.id.four_btn); + four.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (lastPressed_Equals==true||calculate.getText().toString().equals("ERROR")){ + calculate.setText(""); + } + calculate.append("4"); + lastPressed_Equals=false; + } + }); + five = (Button) findViewById(R.id.five_btn); + five.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (lastPressed_Equals==true||calculate.getText().toString().equals("ERROR")){ + calculate.setText(""); + } + calculate.append("5"); + lastPressed_Equals=false; + } + }); + six=(Button) findViewById(R.id.six_btn); + six.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (lastPressed_Equals==true||calculate.getText().toString().equals("ERROR")){ + calculate.setText(""); + } + calculate.append("6"); + lastPressed_Equals=false; + } + }); + seven = (Button) findViewById(R.id.seven_btn); + seven.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (lastPressed_Equals==true||calculate.getText().toString().equals("ERROR")){ + calculate.setText(""); + } + calculate.append("7"); + lastPressed_Equals=false; + } + }); + eight = (Button) findViewById(R.id.eight_btn); + eight.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (lastPressed_Equals==true||calculate.getText().toString().equals("ERROR")){ + calculate.setText(""); + } + calculate.append("8"); + lastPressed_Equals=false; + } + }); + nine = (Button) findViewById(R.id.nine_btn); + nine.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (lastPressed_Equals==true||calculate.getText().toString().equals("ERROR")){ + calculate.setText(""); + } + calculate.append("9"); + lastPressed_Equals=false; + } + }); + zero = (Button) findViewById(R.id.zero_btn); + zero.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (lastPressed_Equals==true||calculate.getText().toString().equals("ERROR")){ + calculate.setText(""); + } + calculate.append("0"); + lastPressed_Equals=false; + } + }); + clear = (Button) findViewById(R.id.clear_btn); + clear.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (lastPressed_Equals==true||calculate.getText().toString().equals("ERROR")){ + calculate.setText(""); + } + calculate.setText(""); + lastPressed_Equals=false; + } + }); + equalsBtn = (Button) findViewById(R.id.equals_btn); + equalsBtn.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + String input = calculate.getText().toString(); + String input2 = ""; +// if (radians) { +// input2 = "RAD(" + input + ")"; +// } +// else { +// input2 = "DEG(" + input + ")"; +// } + try{ + Expression exp = new Expression(input); + BigDecimal answer; + answer = exp.eval(); + String anwserStr = answer.toString(); + calculate.setText(anwserStr); + } + catch (RuntimeException e){ + calculate.setText("ERROR"); + } + lastPressed_Equals=true; + } + }); + bksp = (Button) findViewById(R.id.backspace_btn); + bksp.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (lastPressed_Equals==true||calculate.getText().toString().equals("ERROR")){ + calculate.setText(""); + } + if(calculate.getText().toString().length()>0){ + String past = calculate.getText().toString(); + String now = past.substring(0,past.length()-1); + calculate.setText(now); + } + lastPressed_Equals=false; + } + }); + rightParenthesis = (Button) findViewById(R.id.right_parenthesis_btn); + rightParenthesis.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (lastPressed_Equals==true||calculate.getText().toString().equals("ERROR")){ + calculate.setText(""); + } + calculate.append(")"); + lastPressed_Equals=false; + } + }); + leftParenthesis = (Button) findViewById(R.id.left_parenthesis_btn); + leftParenthesis.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (lastPressed_Equals==true||calculate.getText().toString().equals("ERROR")){ + calculate.setText(""); + } + calculate.append("("); + lastPressed_Equals=false; + } + }); + decimal = (Button) findViewById(R.id.decimal_btn); + decimal.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (lastPressed_Equals==true||calculate.getText().toString().equals("ERROR")){ + calculate.setText(""); + } + calculate.append("."); + lastPressed_Equals=false; + } + }); + + // SCICALC +// if(findViewById(R.id.factorial_btn)!=null) { +// factorial = (Button) findViewById(R.id.factorial_btn); +// factorial.setOnClickListener(new View.OnClickListener() { +// @Override +// public void onClick(View v) { +// if (lastPressed_Equals==true||calculate.getText().toString().equals("ERROR")){ +// calculate.setText(""); +// } +// calculate.append("!("); +// lastPressed_Equals=false; +// } +// }); +// } + if(findViewById(R.id.sqrt_btn)!=null) { + sqrt = (Button) findViewById(R.id.sqrt_btn); + sqrt.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (lastPressed_Equals==true||calculate.getText().toString().equals("ERROR")){ + calculate.setText(""); + } + calculate.append("sqrt("); + lastPressed_Equals=false; + } + }); + } +// if(findViewById(R.id.percent_btn)!=null) { +// percentage = (Button) findViewById(R.id.percent_btn); +// percentage.setOnClickListener(new View.OnClickListener() { +// @Override +// public void onClick(View v) { +// if (lastPressed_Equals==true||calculate.getText().toString().equals("ERROR")){ +// calculate.setText(""); +// } +// calculate.append("%"); +// lastPressed_Equals=false; +// } +// }); +// } + if(findViewById(R.id.sin_btn)!=null) { + sin = (Button) findViewById(R.id.sin_btn); + sin.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (lastPressed_Equals==true||calculate.getText().toString().equals("ERROR")){ + calculate.setText(""); + } + calculate.append("sin("); + lastPressed_Equals=false; + } + }); + } + if(findViewById(R.id.cos_btn)!=null) { + cos = (Button) findViewById(R.id.cos_btn); + cos.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (lastPressed_Equals==true||calculate.getText().toString().equals("ERROR")){ + calculate.setText(""); + } + calculate.append("cos("); + lastPressed_Equals=false; + } + }); + } + if(findViewById(R.id.tan_btn)!=null) { + tan = (Button) findViewById(R.id.tan_btn); + tan.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (lastPressed_Equals==true||calculate.getText().toString().equals("ERROR")){ + calculate.setText(""); + } + calculate.append("tan("); + lastPressed_Equals=false; + } + }); + } +// //RAD and DEG button, toggles title bar to display +// //calc - radians or calc - degrees +// if(findViewById(R.id.rd_btn)!=null) { +// rd = (Button) findViewById(R.id.rd_btn); +// rd.setOnClickListener(new View.OnClickListener() { +// @Override +// public void onClick(View v) { +// if (lastPressed_Equals==true||calculate.getText().toString().equals("ERROR")){ +// calculate.setText(""); +// } +// if (radians) { +// getActionBar().setTitle("Calc - degrees"); +// radians = false; +// rd.setText("RAD"); +// } +// else { +// getActionBar().setTitle("Calc - radians"); +// radians = true; +// rd.setText("DEG"); +// } +// //calculate.append("Ln("); +// lastPressed_Equals=false; +// } +// }); +// } + if(findViewById(R.id.log_btn)!=null) { + log = (Button) findViewById(R.id.log_btn); + log.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (lastPressed_Equals==true||calculate.getText().toString().equals("ERROR")){ + calculate.setText(""); + } + calculate.append("log("); + lastPressed_Equals=false; + } + }); + } + if(findViewById(R.id.denominator_btn)!=null) { + oneOverX = (Button) findViewById(R.id.denominator_btn); + oneOverX.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (lastPressed_Equals==true||calculate.getText().toString().equals("ERROR")){ + calculate.setText(""); + } + calculate.append("1/"); + lastPressed_Equals=false; + } + }); + } + if(findViewById(R.id.ePOWx_btn)!=null) { + eX = (Button) findViewById(R.id.ePOWx_btn); + eX.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (lastPressed_Equals==true||calculate.getText().toString().equals("ERROR")){ + calculate.setText(""); + } + calculate.append("E^"); + lastPressed_Equals=false; + } + }); + } + if(findViewById(R.id.xsquared_btn)!=null) { + xSquared = (Button) findViewById(R.id.xsquared_btn); + xSquared.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (lastPressed_Equals==true||calculate.getText().toString().equals("ERROR")){ + calculate.setText(""); + } + calculate.append("^2"); + lastPressed_Equals=false; + } + }); + } + if(findViewById(R.id.absolute_btn)!=null) { + absolute = (Button) findViewById(R.id.absolute_btn); + absolute.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (lastPressed_Equals==true||calculate.getText().toString().equals("ERROR")){ + calculate.setText(""); + } + calculate.append("ABS("); + lastPressed_Equals=false; + } + }); + } + if(findViewById(R.id.pi_btn)!=null) { + pi = (Button) findViewById(R.id.pi_btn); + pi.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (lastPressed_Equals==true||calculate.getText().toString().equals("ERROR")){ + calculate.setText(""); + } + calculate.append("PI"); + lastPressed_Equals=false; + } + }); + } + if(findViewById(R.id.e_btn)!=null) { + e = (Button) findViewById(R.id.e_btn); + e.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (lastPressed_Equals==true||calculate.getText().toString().equals("ERROR")){ + calculate.setText(""); + } + calculate.append("E"); + lastPressed_Equals=false; + } + }); + } + if(findViewById(R.id.YpowX_btn)!=null) { + yToX = (Button) findViewById(R.id.YpowX_btn); + yToX.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (lastPressed_Equals==true||calculate.getText().toString().equals("ERROR")){ + calculate.setText(""); + } + calculate.append("^"); + lastPressed_Equals=false; + } + }); + } + + } + + @Override + public void onSaveInstanceState(Bundle savedInstanceState) { + TextView tv = (TextView) findViewById(R.id.calculate); + savedInstanceState.putString(STATE_DISPLAY, tv.getText().toString()); + super.onSaveInstanceState(savedInstanceState); + } +} diff --git a/app/src/main/res/drawable/selector_button.xml b/app/src/main/res/drawable/selector_button.xml new file mode 100644 index 0000000..fad8b26 --- /dev/null +++ b/app/src/main/res/drawable/selector_button.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/selector_button2.xml b/app/src/main/res/drawable/selector_button2.xml new file mode 100644 index 0000000..0b927f2 --- /dev/null +++ b/app/src/main/res/drawable/selector_button2.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout-land/activity_main.xml b/app/src/main/res/layout-land/activity_main.xml new file mode 100644 index 0000000..98d0bf4 --- /dev/null +++ b/app/src/main/res/layout-land/activity_main.xml @@ -0,0 +1,271 @@ + + + + + + + + +