diff --git a/app/src/main/java/meow/sweetbread/lincalc/MainActivity.kt b/app/src/main/java/meow/sweetbread/lincalc/MainActivity.kt index f7ff23e..c3af147 100644 --- a/app/src/main/java/meow/sweetbread/lincalc/MainActivity.kt +++ b/app/src/main/java/meow/sweetbread/lincalc/MainActivity.kt @@ -184,7 +184,8 @@ class MainActivity : AppCompatActivity() { } else if (tokensType.containsKey(chr.toString())) { if (tokens.isNotEmpty()) { - if ((tokensType[chr.toString()]!! == Tokens.BracketOpen) and (tokens.last().type == Tokens.Number)) + if ((tokensType[chr.toString()]!! == Tokens.BracketOpen) and + (tokens.last().type in arrayOf(Tokens.Number, Tokens.Variable))) tokens += Token(Tokens.Operations, "*") if ((chr == '-') and (tokens.last().type != Tokens.Number)) tokens += Token(Tokens.Number, 0.toDouble()) diff --git a/app/src/main/res/drawable-night/button.xml b/app/src/main/res/drawable-night/button.xml new file mode 100644 index 0000000..e4546c7 --- /dev/null +++ b/app/src/main/res/drawable-night/button.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable-night/button_enabled.xml b/app/src/main/res/drawable-night/button_enabled.xml new file mode 100644 index 0000000..6a83b3c --- /dev/null +++ b/app/src/main/res/drawable-night/button_enabled.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable-v24/background.png b/app/src/main/res/drawable-v24/background.png new file mode 100644 index 0000000..7bddcac Binary files /dev/null and b/app/src/main/res/drawable-v24/background.png differ diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 879bf4d..3d0ef24 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -6,6 +6,17 @@ android:layout_height="match_parent" tools:context=".MainActivity"> + +