#58: Preparation of the release 2.16.2: fixed minor bugs

mkulesh · Feb 1, 2018 · 28b6c3d · 28b6c3d
1 parent 01619cd
commit 28b6c3d
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 17 deletions.
diff --git a/app/src/main/assets/functions_overview.mmt b/app/src/main/assets/functions_overview.mmt
@@ -998,7 +998,7 @@
       </term>
     </equation>
     <text_fragment>
-      <term key="text" text="A plot with automatically calculated&#10;boudaries:" />
+      <term key="text" text="A plot with automatically calculated&#10;boundaries:" />
     </text_fragment>
     <plot_function width="680" height="500" axes_style="crossed" xLabelsNumber="4" yLabelsNumber="4" gridLineColor="#FF787878" functionsNumber="1">
       <term key="yMaxValue" text="" />

diff --git a/app/src/main/assets/release_notes.mmt b/app/src/main/assets/release_notes.mmt
@@ -5,7 +5,7 @@
       <term key="text" text="Current release:" />
     </text_fragment>
     <text_fragment numbering="true">
-      <term key="text" text="Added a button on the toool bar that&#10;allows us to make button groups&#10;visible/invisible." />
+      <term key="text" text="Added a button on the tool bar that&#10;allows us to make button groups&#10;visible/invisible." />
     </text_fragment>
     <text_fragment numbering="true">
       <term key="text" text="Added new build-in functions: round,&#10;mod, trunc, perc, log, cot, csc, sec,&#10;acot, acsc, asec, coth, csch, sech. " />

diff --git a/app/src/main/java/com/mkulesh/micromath/widgets/TwoDScrollView.java b/app/src/main/java/com/mkulesh/micromath/widgets/TwoDScrollView.java
@@ -25,7 +25,6 @@
 import android.support.v4.view.GestureDetectorCompat;
 import android.support.v4.view.MotionEventCompat;
 import android.support.v4.view.ViewCompat;
-import android.support.v4.widget.EdgeEffectCompat;
 import android.support.v7.app.AppCompatActivity;
 import android.util.AttributeSet;
 import android.view.FocusFinder;
@@ -37,6 +36,7 @@
 import android.view.ViewGroup;
 import android.view.ViewParent;
 import android.view.animation.AnimationUtils;
+import android.widget.EdgeEffect;
 import android.widget.FrameLayout;
 import android.widget.LinearLayout;
 import android.widget.Scroller;
@@ -91,10 +91,10 @@ public class TwoDScrollView extends FrameLayout
 
     private int autoScrollMargins = 0;
 
-    private EdgeEffectCompat mEdgeGlowTop;
-    private EdgeEffectCompat mEdgeGlowBottom;
-    private EdgeEffectCompat mEdgeGlowLeft;
-    private EdgeEffectCompat mEdgeGlowRight;
+    private EdgeEffect mEdgeGlowTop;
+    private EdgeEffect mEdgeGlowBottom;
+    private EdgeEffect mEdgeGlowLeft;
+    private EdgeEffect mEdgeGlowRight;
 
     /*********************************************************
      * Creating
@@ -132,10 +132,10 @@ private void prepare(AttributeSet attrs)
             autoScrollMargins = a.getDimensionPixelSize(R.styleable.CustomViewExtension_autoScrollMargins, 0);
             a.recycle();
         }
-        mEdgeGlowLeft = new EdgeEffectCompat(getContext());
-        mEdgeGlowTop = new EdgeEffectCompat(getContext());
-        mEdgeGlowRight = new EdgeEffectCompat(getContext());
-        mEdgeGlowBottom = new EdgeEffectCompat(getContext());
+        mEdgeGlowLeft = new EdgeEffect(getContext());
+        mEdgeGlowTop = new EdgeEffect(getContext());
+        mEdgeGlowRight = new EdgeEffect(getContext());
+        mEdgeGlowBottom = new EdgeEffect(getContext());
         setWillNotDraw(false);
     }
 
@@ -325,7 +325,7 @@ public boolean onScroll(MotionEvent e1, MotionEvent e2, float deltaX, float delt
                 final int pulledToX = getScrollX() + (int) deltaX;
                 if (pulledToX < 0)
                 {
-                    mEdgeGlowLeft.onPull((float) deltaX / getWidth(), 0);
+                    mEdgeGlowLeft.onPull((float) deltaX / getWidth());
                     if (!mEdgeGlowRight.isFinished())
                     {
                         mEdgeGlowRight.onRelease();
@@ -334,7 +334,7 @@ public boolean onScroll(MotionEvent e1, MotionEvent e2, float deltaX, float delt
                 }
                 else if (pulledToX > rangeX)
                 {
-                    mEdgeGlowRight.onPull((float) deltaX / getWidth(), 0);
+                    mEdgeGlowRight.onPull((float) deltaX / getWidth());
                     if (!mEdgeGlowLeft.isFinished())
                     {
                         mEdgeGlowLeft.onRelease();
@@ -353,7 +353,7 @@ else if (pulledToX > rangeX)
                 final int pulledToY = getScrollY() + (int) deltaY;
                 if (pulledToY < 0)
                 {
-                    mEdgeGlowTop.onPull((float) deltaY / getHeight(), 0);
+                    mEdgeGlowTop.onPull((float) deltaY / getHeight());
                     if (!mEdgeGlowBottom.isFinished())
                     {
                         mEdgeGlowBottom.onRelease();
@@ -362,7 +362,7 @@ else if (pulledToX > rangeX)
                 }
                 else if (pulledToY > rangeY)
                 {
-                    mEdgeGlowBottom.onPull((float) deltaY / getHeight(), 0);
+                    mEdgeGlowBottom.onPull((float) deltaY / getHeight());
                     if (!mEdgeGlowTop.isFinished())
                     {
                         mEdgeGlowTop.onRelease();

diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
@@ -34,7 +34,7 @@
     <dimen name="formula_text_size">@dimen/abc_text_size_display_1_material</dimen>
     <dimen name="formula_text_minwidth">25dp</dimen>
     <dimen name="formula_hor_text_padding">3dp</dimen>
-    <dimen name="formula_big_symbol_size">@dimen/abc_text_size_display_3_material</dimen>
+    <dimen name="formula_big_symbol_size">52sp</dimen>
     <dimen name="formula_small_symbol_size">18dp</dimen>
     <dimen name="formula_hor_symbol_padding">4dp</dimen>
     <dimen name="formula_hor_bracket_padding">0dp</dimen>

diff --git a/doc/html/functions_overview.html b/doc/html/functions_overview.html
@@ -483,7 +483,7 @@ <h4>11 Function plots</h4>
 </tr></table><br>
 
 <p>A plot with automatically calculated
-boudaries:</p>
+boundaries:</p>
 
 <table border = "0" cellspacing="0" cellpadding="0"><tr>
   <td><img src="functions_overview_fig1.png"alt="Image"></td>