diff --git a/app/build.gradle b/app/build.gradle index 819d631..c380bd7 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ android { applicationId "org.woheller69.arity" minSdk 21 targetSdk 32 - versionCode 36 - versionName "1.36" + versionCode 38 + versionName "1.38" } buildTypes { diff --git a/app/src/main/java/arity/calculator/Calculator.java b/app/src/main/java/arity/calculator/Calculator.java index 15ab5cf..02102bc 100644 --- a/app/src/main/java/arity/calculator/Calculator.java +++ b/app/src/main/java/arity/calculator/Calculator.java @@ -448,10 +448,7 @@ private void showGraph(Function f) { if (f.arity() == 1) { graphView.setFunction(f); if (graphView.getVisibility() != View.VISIBLE) { - if (isAlphaVisible) { - isAlphaVisible = false; - updateAlpha(); - } + result.setVisibility(View.GONE); historyView.setVisibility(View.GONE); graph3dView.setVisibility(View.GONE); @@ -461,10 +458,7 @@ private void showGraph(Function f) { } else { graph3dView.setFunction(f); if (graph3dView.getVisibility() != View.VISIBLE) { - if (isAlphaVisible) { - isAlphaVisible = false; - updateAlpha(); - } + result.setVisibility(View.GONE); historyView.setVisibility(View.GONE); graphView.setVisibility(View.GONE); diff --git a/app/src/main/java/arity/calculator/KeyboardView.java b/app/src/main/java/arity/calculator/KeyboardView.java index 407b90a..604ebe1 100644 --- a/app/src/main/java/arity/calculator/KeyboardView.java +++ b/app/src/main/java/arity/calculator/KeyboardView.java @@ -105,16 +105,16 @@ protected void onSizeChanged(int w, int h, int ow, int oh) { switch (c) { case 'E': - drawDrawable(canvas, R.drawable.enter, x1, y1, cw, ch); + drawDrawable(canvas, R.drawable.ic_keyboard_return, x1, y1, cw, ch); break; case 'C': - drawDrawable(canvas, R.drawable.delete, x1, y1, cw, ch); + drawDrawable(canvas, R.drawable.ic_backspace, x1, y1, cw, ch); break; - case Calculator.ARROW: - canvas.drawText(lineKeys, col, 1, x, y, textPaintLarge); - break; + case Calculator.ARROW: + drawDrawable(canvas, R.drawable.ic_unfold_more, x1, y1, cw, ch); + break; default: // textPaint.setColor(('0' <= c && c <= '9') ? 0xffffff00 : 0xffffffff); diff --git a/app/src/main/res/drawable/delete.png b/app/src/main/res/drawable/delete.png deleted file mode 100644 index 43a033e..0000000 Binary files a/app/src/main/res/drawable/delete.png and /dev/null differ diff --git a/app/src/main/res/drawable/enter.png b/app/src/main/res/drawable/enter.png deleted file mode 100644 index 17f2574..0000000 Binary files a/app/src/main/res/drawable/enter.png and /dev/null differ diff --git a/app/src/main/res/drawable/ic_backspace.xml b/app/src/main/res/drawable/ic_backspace.xml new file mode 100644 index 0000000..be50db2 --- /dev/null +++ b/app/src/main/res/drawable/ic_backspace.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_keyboard_return.xml b/app/src/main/res/drawable/ic_keyboard_return.xml new file mode 100644 index 0000000..f70eada --- /dev/null +++ b/app/src/main/res/drawable/ic_keyboard_return.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_unfold_more.xml b/app/src/main/res/drawable/ic_unfold_more.xml new file mode 100644 index 0000000..00bf85f --- /dev/null +++ b/app/src/main/res/drawable/ic_unfold_more.xml @@ -0,0 +1,9 @@ + + + diff --git a/fastlane/metadata/android/en-US/changelogs/38.txt b/fastlane/metadata/android/en-US/changelogs/38.txt new file mode 100644 index 0000000..f2ec9fa --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/38.txt @@ -0,0 +1 @@ +UI improvements \ No newline at end of file