diff --git a/app/debug/app-debug.apk b/app/debug/app-debug.apk deleted file mode 100644 index f60bc27..0000000 Binary files a/app/debug/app-debug.apk and /dev/null differ diff --git a/app/debug/output-metadata.json b/app/debug/output-metadata.json deleted file mode 100644 index e7ddcb5..0000000 --- a/app/debug/output-metadata.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "version": 3, - "artifactType": { - "type": "APK", - "kind": "Directory" - }, - "applicationId": "meow.sweetbread.lincalc", - "variantName": "debug", - "elements": [ - { - "type": "SINGLE", - "filters": [], - "attributes": [], - "versionCode": 1, - "versionName": "1.0", - "outputFile": "app-debug.apk" - } - ], - "elementType": "File" -} \ No newline at end of file diff --git a/app/src/main/java/meow/sweetbread/lincalc/MainActivity.kt b/app/src/main/java/meow/sweetbread/lincalc/MainActivity.kt index 7ad578a..f7ff23e 100644 --- a/app/src/main/java/meow/sweetbread/lincalc/MainActivity.kt +++ b/app/src/main/java/meow/sweetbread/lincalc/MainActivity.kt @@ -5,117 +5,382 @@ import androidx.appcompat.app.AppCompatActivity import android.os.Bundle import android.util.Log import android.widget.Button +import android.widget.ImageButton import android.widget.TextView +import kotlin.math.pow +import kotlin.math.sqrt class MainActivity : AppCompatActivity() { - private var tmp_buf = "" - var buffer = listOf() - private var act_ena = false - var priority = HashMap() + private var priority = HashMap() + private var tokensType = HashMap() + private val leftAssociative = arrayOf("^") + private var constants = HashMap() @SuppressLint("MissingInflatedId", "CutPasteId") override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setContentView(R.layout.activity_main) - priority.put("+", 1) - priority.put("-", 1) - priority.put("*", 2) - priority.put("/", 2) + priority["("] = 0 + priority["+"] = 1 + priority["-"] = 1 + priority["*"] = 2 + priority["/"] = 2 + priority["^"] = 3 - val input = findViewById(R.id.input) + tokensType["+"] = Tokens.Operations + tokensType["-"] = Tokens.Operations + tokensType["*"] = Tokens.Operations + tokensType["/"] = Tokens.Operations + tokensType["^"] = Tokens.Operations + tokensType["+"] = Tokens.Operations + tokensType["+"] = Tokens.Operations + tokensType["("] = Tokens.BracketOpen + tokensType[")"] = Tokens.BracketClose - findViewById