diff --git a/app/build.gradle b/app/build.gradle index 715c083..6907dc6 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -20,10 +20,11 @@ android { } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) + compile fileTree(include: ['*.jar'], dir: 'libs') testCompile 'junit:junit:4.12' compile 'com.android.support:appcompat-v7:23.4.0' compile 'com.android.support:design:23.4.0' compile 'com.rengwuxian.materialedittext:library:2.1.4' compile 'com.jjoe64:graphview:4.1.1' -} + compile files('libs/mxparser_jdk1.7.jar') +} \ No newline at end of file diff --git a/app/libs/mxparser_jdk1.7.jar b/app/libs/mxparser_jdk1.7.jar new file mode 100644 index 0000000..e2343ad Binary files /dev/null and b/app/libs/mxparser_jdk1.7.jar differ diff --git a/app/src/main/java/tv/tvquetzachapin/graphfunctions/Activites/MainActivity.java b/app/src/main/java/tv/tvquetzachapin/graphfunctions/Activites/MainActivity.java index 167218a..a23409e 100644 --- a/app/src/main/java/tv/tvquetzachapin/graphfunctions/Activites/MainActivity.java +++ b/app/src/main/java/tv/tvquetzachapin/graphfunctions/Activites/MainActivity.java @@ -9,6 +9,10 @@ import android.view.View; import android.view.Menu; import android.view.MenuItem; +import android.widget.Toast; + +import org.mariuszgromada.math.mxparser.Argument; +import org.mariuszgromada.math.mxparser.Expression; import tv.tvquetzachapin.graphfunctions.R; @@ -21,7 +25,9 @@ protected void onCreate(Bundle savedInstanceState) { Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); setSupportActionBar(toolbar); + operateEQ(); FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab); + fab.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { @@ -52,4 +58,10 @@ public boolean onOptionsItemSelected(MenuItem item) { return super.onOptionsItemSelected(item); } + + public void operateEQ() { + Argument x = new Argument("x = 5"); + Expression e = new Expression("3*(x)^2",x); + Toast.makeText(MainActivity.this, "OP: " + e.calculate(), Toast.LENGTH_SHORT).show(); + } }