diff --git a/app/src/main/assets/functions_overview.mmt b/app/src/main/assets/functions_overview.mmt
index 173de816..4ba1a604 100644
--- a/app/src/main/assets/functions_overview.mmt
+++ b/app/src/main/assets/functions_overview.mmt
@@ -998,7 +998,7 @@
-
+
diff --git a/app/src/main/assets/release_notes.mmt b/app/src/main/assets/release_notes.mmt
index aad94afb..1211f1e4 100644
--- a/app/src/main/assets/release_notes.mmt
+++ b/app/src/main/assets/release_notes.mmt
@@ -5,7 +5,7 @@
-
+
diff --git a/app/src/main/java/com/mkulesh/micromath/widgets/TwoDScrollView.java b/app/src/main/java/com/mkulesh/micromath/widgets/TwoDScrollView.java
index d660ecee..8e1d6bcf 100644
--- 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
index e67676b6..e77ff57a 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -34,7 +34,7 @@
@dimen/abc_text_size_display_1_material
25dp
3dp
- @dimen/abc_text_size_display_3_material
+ 52sp
18dp
4dp
0dp
diff --git a/doc/html/functions_overview.html b/doc/html/functions_overview.html
index e54263eb..a28c2ea1 100644
--- a/doc/html/functions_overview.html
+++ b/doc/html/functions_overview.html
@@ -483,7 +483,7 @@ 11 Function plots
A plot with automatically calculated
-boudaries:
+boundaries:
![Image](functions_overview_fig1.png) |