Update V1.38

fixes #7 fixes #8
woheller69 · Mar 19, 2023 · 7880b79 · 7880b79
1 parent 375054f
commit 7880b79
Show file tree

Hide file tree

Showing 9 changed files with 37 additions and 15 deletions.
diff --git 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
@@ -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
@@ -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
diff --git a/app/src/main/res/drawable/enter.png b/app/src/main/res/drawable/enter.png
diff --git a/app/src/main/res/drawable/ic_backspace.xml b/app/src/main/res/drawable/ic_backspace.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="36dp"
+    android:height="36dp"
+    android:viewportWidth="48"
+    android:viewportHeight="48">
+  <path
+      android:fillColor="#FFFFFFFF"
+      android:pathData="m22.4,31.7 l5.6,-5.6 5.6,5.6 2.15,-2.15L30.1,24l5.55,-5.55 -2.15,-2.15 -5.5,5.6 -5.6,-5.6 -2.15,2.15L25.9,24l-5.65,5.55ZM6,24l8.45,-11.95q0.65,-0.9 1.55,-1.475 0.9,-0.575 2,-0.575h21q1.25,0 2.125,0.875T42,13v22q0,1.25 -0.875,2.125T39,38L18,38q-1.1,0 -2,-0.575 -0.9,-0.575 -1.55,-1.475ZM9.75,24 L17.45,35L39,35L39,13L17.45,13ZM39,24L39,13v22Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_keyboard_return.xml b/app/src/main/res/drawable/ic_keyboard_return.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="36dp"
+    android:height="36dp"
+    android:viewportWidth="48"
+    android:viewportHeight="48">
+  <path
+      android:fillColor="#FFFFFFFF"
+      android:pathData="M18,36 L6.05,24.05 18,12.1l2.15,2.15 -8.35,8.35H39V14h3v11.55H11.85l8.3,8.3Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_unfold_more.xml b/app/src/main/res/drawable/ic_unfold_more.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="36dp"
+    android:height="36dp"
+    android:viewportWidth="48"
+    android:viewportHeight="48">
+  <path
+      android:fillColor="#FFFFFFFF"
+      android:pathData="m24,42 l-9,-9 2.2,-2.2 6.8,6.8 6.8,-6.8L33,33ZM17.2,17.4L15,15.2l9,-9 9,9 -2.2,2.2 -6.8,-6.8Z"/>
+</vector>
diff --git a/fastlane/metadata/android/en-US/changelogs/38.txt b/fastlane/metadata/android/en-US/changelogs/38.txt
@@ -0,0 +1 @@
+UI improvements