Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

updated readme

  • Loading branch information...
commit 39fc321d864f64b970e739c6a1963c839040618c 1 parent 4cb72f1
@Xlythe authored
View
7 Android.mk
@@ -19,7 +19,10 @@ include $(CLEAR_VARS)
LOCAL_MODULE_TAGS := optional
-LOCAL_STATIC_JAVA_LIBRARIES := libarity android-support-v4
+LOCAL_PROGUARD_FLAG_FILES := proguard.flags
+
+LOCAL_STATIC_JAVA_LIBRARIES := libarity android-support-v4 guava
+LOCAL_STATIC_JAVA_LIBRARIES += chartengine ejml slider
LOCAL_SRC_FILES := $(call all-java-files-under, src)
@@ -31,7 +34,7 @@ include $(BUILD_PACKAGE)
##################################################
include $(CLEAR_VARS)
-LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES := libarity:arity-2.1.2.jar
+LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES := libarity:libs/arity-2.1.6.jar chartengine:libs/achartengine.jar ejml:libs/ejml-0.21.jar slider:libs/slider.jar
include $(BUILD_MULTI_PREBUILT)
View
26 README.md
@@ -1,21 +1,19 @@
# Calculator
-A very simple calculator that tries to make graphing and matrix math as simple as adding or multiplying two numbers. Slide left and right to access more panels.
-
-It's feature complete for now.
+A calculator that tries to include graphing and matrix math without losing its simplicity. Slide left and right to access more panels.
Features:
-* Addition, subtraction, multiplication, division. Really, if I broke this I'm sure you guys would find a way to give me negative stars.
-* Advanced functions like log, sin, cos and irrational numbers like pi and e.
-* Calculate complex numbers.
-* Graph X,Y Equations.
-* Matrix addition, multiplication, determinants, and eigen values.
-* Hexadecimal, Binary support
-* Displays history by pulling down from the top (long press to copy)
-* Hide the pages you don't need
+* Basic arithmetic (+, -, *, /)
+* Trigonometry (sin, cos, tan, arcsin, arccos, arctan)
+* Complex numbers (5+7i)
+* Graphs X,Y functions (Y=X^2)
+* Basic matrix math (+, *)
+* Hexadecimal and Binary support (1A+E)
+* Animated history (Long press to copy)
+* Hide pages you don't need
* Tablet and Smartphone supported
-* Completely open source!
+* Completely open source!
Jar files:
@@ -25,8 +23,8 @@ achartengine.jar - A modified version of achartengine (http://achartengine.org/)
arity-2.1.6.jar - Arity (http://code.google.com/p/arity/)
Arity is used to solve math given as a string
-commons-math3-3.0.jar - Apache Commons Math (http://commons.apache.org/math/)
- Apache Commons Math is used to resolve matrix math
+ejml-0.21.jar - Efficient Java Matrix Library (http://code.google.com/p/efficient-java-matrix-library/)
+ Used to resolve matrix math
slider.jar - Slider (https://github.com/Xlythe/Slider)
Slider is an animated view developed by me. It's used for the history pull down.
View
2  src/com/android2/calculator3/view/ScrollableDisplay.java
@@ -39,7 +39,7 @@ private int getScrollRange() {
return scrollRange;
}
- private boolean gravityRight;
+ private boolean gravityRight = false;
@Override
protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
Please sign in to comment.
Something went wrong with that request. Please try again.