aboutsummaryrefslogtreecommitdiff
path: root/MPChartLib/src/main/java/com
diff options
context:
space:
mode:
authoralmic <mick.ashton@flare-esports.net>2018-11-11 09:40:37 -0700
committeralmic <mick.ashton@flare-esports.net>2018-11-11 09:40:37 -0700
commit29f4cc5c2c5c7e5468759bb5ad414e9855cd09c6 (patch)
treeadf0af61a22e7a042ea01002a90c67c9af78d1fa /MPChartLib/src/main/java/com
parentfc0e2342984758849384199f0225e0c6b5555168 (diff)
downloadMPAndroidChart-29f4cc5c2c5c7e5468759bb5ad414e9855cd09c6.tar.gz
Remove unnecessary API checks
Also added run configuration for the MPChartExample. Removed deprecated Legend stuff.
Diffstat (limited to 'MPChartLib/src/main/java/com')
-rw-r--r--MPChartLib/src/main/java/com/github/mikephil/charting/charts/BarLineChartBase.java56
-rw-r--r--MPChartLib/src/main/java/com/github/mikephil/charting/charts/Chart.java34
-rw-r--r--MPChartLib/src/main/java/com/github/mikephil/charting/charts/PieRadarChartBase.java3
-rw-r--r--MPChartLib/src/main/java/com/github/mikephil/charting/components/Legend.java94
4 files changed, 32 insertions, 155 deletions
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/charts/BarLineChartBase.java b/MPChartLib/src/main/java/com/github/mikephil/charting/charts/BarLineChartBase.java
index 0b0219e4..71f8a2d8 100644
--- a/MPChartLib/src/main/java/com/github/mikephil/charting/charts/BarLineChartBase.java
+++ b/MPChartLib/src/main/java/com/github/mikephil/charting/charts/BarLineChartBase.java
@@ -708,20 +708,14 @@ public abstract class BarLineChartBase<T extends BarLineScatterCandleBubbleData<
public void zoomAndCenterAnimated(float scaleX, float scaleY, float xValue, float yValue, AxisDependency axis,
long duration) {
- if (android.os.Build.VERSION.SDK_INT >= 11) {
+ MPPointD origin = getValuesByTouchPoint(mViewPortHandler.contentLeft(), mViewPortHandler.contentTop(), axis);
- MPPointD origin = getValuesByTouchPoint(mViewPortHandler.contentLeft(), mViewPortHandler.contentTop(), axis);
-
- Runnable job = AnimatedZoomJob.getInstance(mViewPortHandler, this, getTransformer(axis), getAxis(axis), mXAxis
- .mAxisRange, scaleX, scaleY, mViewPortHandler.getScaleX(), mViewPortHandler.getScaleY(),
- xValue, yValue, (float) origin.x, (float) origin.y, duration);
- addViewportJob(job);
-
- MPPointD.recycleInstance(origin);
+ Runnable job = AnimatedZoomJob.getInstance(mViewPortHandler, this, getTransformer(axis), getAxis(axis), mXAxis
+ .mAxisRange, scaleX, scaleY, mViewPortHandler.getScaleX(), mViewPortHandler.getScaleY(),
+ xValue, yValue, (float) origin.x, (float) origin.y, duration);
+ addViewportJob(job);
- } else {
- Log.e(LOG_TAG, "Unable to execute zoomAndCenterAnimated(...) on API level < 11");
- }
+ MPPointD.recycleInstance(origin);
}
protected Matrix mFitScreenMatrixBuffer = new Matrix();
@@ -874,21 +868,16 @@ public abstract class BarLineChartBase<T extends BarLineScatterCandleBubbleData<
@TargetApi(11)
public void moveViewToAnimated(float xValue, float yValue, AxisDependency axis, long duration) {
- if (android.os.Build.VERSION.SDK_INT >= 11) {
+ MPPointD bounds = getValuesByTouchPoint(mViewPortHandler.contentLeft(), mViewPortHandler.contentTop(), axis);
- MPPointD bounds = getValuesByTouchPoint(mViewPortHandler.contentLeft(), mViewPortHandler.contentTop(), axis);
-
- float yInView = getAxisRange(axis) / mViewPortHandler.getScaleY();
+ float yInView = getAxisRange(axis) / mViewPortHandler.getScaleY();
- Runnable job = AnimatedMoveViewJob.getInstance(mViewPortHandler, xValue, yValue + yInView / 2f,
- getTransformer(axis), this, (float) bounds.x, (float) bounds.y, duration);
+ Runnable job = AnimatedMoveViewJob.getInstance(mViewPortHandler, xValue, yValue + yInView / 2f,
+ getTransformer(axis), this, (float) bounds.x, (float) bounds.y, duration);
- addViewportJob(job);
+ addViewportJob(job);
- MPPointD.recycleInstance(bounds);
- } else {
- Log.e(LOG_TAG, "Unable to execute moveViewToAnimated(...) on API level < 11");
- }
+ MPPointD.recycleInstance(bounds);
}
/**
@@ -941,23 +930,18 @@ public abstract class BarLineChartBase<T extends BarLineScatterCandleBubbleData<
@TargetApi(11)
public void centerViewToAnimated(float xValue, float yValue, AxisDependency axis, long duration) {
- if (android.os.Build.VERSION.SDK_INT >= 11) {
-
- MPPointD bounds = getValuesByTouchPoint(mViewPortHandler.contentLeft(), mViewPortHandler.contentTop(), axis);
+ MPPointD bounds = getValuesByTouchPoint(mViewPortHandler.contentLeft(), mViewPortHandler.contentTop(), axis);
- float yInView = getAxisRange(axis) / mViewPortHandler.getScaleY();
- float xInView = getXAxis().mAxisRange / mViewPortHandler.getScaleX();
+ float yInView = getAxisRange(axis) / mViewPortHandler.getScaleY();
+ float xInView = getXAxis().mAxisRange / mViewPortHandler.getScaleX();
- Runnable job = AnimatedMoveViewJob.getInstance(mViewPortHandler,
- xValue - xInView / 2f, yValue + yInView / 2f,
- getTransformer(axis), this, (float) bounds.x, (float) bounds.y, duration);
+ Runnable job = AnimatedMoveViewJob.getInstance(mViewPortHandler,
+ xValue - xInView / 2f, yValue + yInView / 2f,
+ getTransformer(axis), this, (float) bounds.x, (float) bounds.y, duration);
- addViewportJob(job);
+ addViewportJob(job);
- MPPointD.recycleInstance(bounds);
- } else {
- Log.e(LOG_TAG, "Unable to execute centerViewToAnimated(...) on API level < 11");
- }
+ MPPointD.recycleInstance(bounds);
}
/**
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/charts/Chart.java b/MPChartLib/src/main/java/com/github/mikephil/charting/charts/Chart.java
index 0a1869e5..1889a9f6 100644
--- a/MPChartLib/src/main/java/com/github/mikephil/charting/charts/Chart.java
+++ b/MPChartLib/src/main/java/com/github/mikephil/charting/charts/Chart.java
@@ -208,18 +208,14 @@ public abstract class Chart<T extends ChartData<? extends IDataSet<? extends Ent
setWillNotDraw(false);
// setLayerType(View.LAYER_TYPE_HARDWARE, null);
- if (Build.VERSION.SDK_INT < 11) {
- mAnimator = new ChartAnimator();
- } else {
- mAnimator = new ChartAnimator(new AnimatorUpdateListener() {
-
- @Override
- public void onAnimationUpdate(ValueAnimator animation) {
- // ViewCompat.postInvalidateOnAnimation(Chart.this);
- postInvalidate();
- }
- });
- }
+ mAnimator = new ChartAnimator(new AnimatorUpdateListener() {
+
+ @Override
+ public void onAnimationUpdate(ValueAnimator animation) {
+ // ViewCompat.postInvalidateOnAnimation(Chart.this);
+ postInvalidate();
+ }
+ });
// initialize the utils
Utils.init(getContext());
@@ -1697,16 +1693,10 @@ public abstract class Chart<T extends ChartData<? extends IDataSet<? extends Ent
*/
public void setHardwareAccelerationEnabled(boolean enabled) {
- if (android.os.Build.VERSION.SDK_INT >= 11) {
-
- if (enabled)
- setLayerType(View.LAYER_TYPE_HARDWARE, null);
- else
- setLayerType(View.LAYER_TYPE_SOFTWARE, null);
- } else {
- Log.e(LOG_TAG,
- "Cannot enable/disable hardware acceleration for devices below API level 11.");
- }
+ if (enabled)
+ setLayerType(View.LAYER_TYPE_HARDWARE, null);
+ else
+ setLayerType(View.LAYER_TYPE_SOFTWARE, null);
}
@Override
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/charts/PieRadarChartBase.java b/MPChartLib/src/main/java/com/github/mikephil/charting/charts/PieRadarChartBase.java
index 618de18a..e6d38d3a 100644
--- a/MPChartLib/src/main/java/com/github/mikephil/charting/charts/PieRadarChartBase.java
+++ b/MPChartLib/src/main/java/com/github/mikephil/charting/charts/PieRadarChartBase.java
@@ -480,9 +480,6 @@ public abstract class PieRadarChartBase<T extends ChartData<? extends IDataSet<?
@SuppressLint("NewApi")
public void spin(int durationmillis, float fromangle, float toangle, EasingFunction easing) {
- if (android.os.Build.VERSION.SDK_INT < 11)
- return;
-
setRotationAngle(fromangle);
ObjectAnimator spinAnimator = ObjectAnimator.ofFloat(this, "rotationAngle", fromangle,
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/components/Legend.java b/MPChartLib/src/main/java/com/github/mikephil/charting/components/Legend.java
index e3782e7c..b7850988 100644
--- a/MPChartLib/src/main/java/com/github/mikephil/charting/components/Legend.java
+++ b/MPChartLib/src/main/java/com/github/mikephil/charting/components/Legend.java
@@ -20,19 +20,6 @@ import java.util.List;
*/
public class Legend extends ComponentBase {
- /**
- * This property is deprecated - Use `horizontalAlignment`, `verticalAlignment`, `orientation`, `drawInside`,
- * `direction`.
- */
- @Deprecated
- public enum LegendPosition {
- RIGHT_OF_CHART, RIGHT_OF_CHART_CENTER, RIGHT_OF_CHART_INSIDE,
- LEFT_OF_CHART, LEFT_OF_CHART_CENTER, LEFT_OF_CHART_INSIDE,
- BELOW_CHART_LEFT, BELOW_CHART_RIGHT, BELOW_CHART_CENTER,
- ABOVE_CHART_LEFT, ABOVE_CHART_RIGHT, ABOVE_CHART_CENTER,
- PIECHART_CENTER
- }
-
public enum LegendForm {
/**
* Avoid drawing a form
@@ -180,38 +167,6 @@ public class Legend extends ComponentBase {
this.mEntries = entries;
}
- @Deprecated
- public Legend(int[] colors, String[] labels) {
- this();
-
- if (colors == null || labels == null) {
- throw new IllegalArgumentException("colors array or labels array is NULL");
- }
-
- if (colors.length != labels.length) {
- throw new IllegalArgumentException(
- "colors array and labels array need to be of same size");
- }
-
- List<LegendEntry> entries = new ArrayList<>();
-
- for (int i = 0; i < Math.min(colors.length, labels.length); i++) {
- final LegendEntry entry = new LegendEntry();
- entry.formColor = colors[i];
- entry.label = labels[i];
-
- if (entry.formColor == ColorTemplate.COLOR_SKIP)
- entry.form = LegendForm.NONE;
- else if (entry.formColor == ColorTemplate.COLOR_NONE ||
- entry.formColor == 0)
- entry.form = LegendForm.EMPTY;
-
- entries.add(entry);
- }
-
- mEntries = entries.toArray(new LegendEntry[entries.size()]);
- }
-
/**
* This method sets the automatically computed colors for the legend. Use setCustom(...) to set custom colors.
*
@@ -280,50 +235,6 @@ public class Legend extends ComponentBase {
return max;
}
- @Deprecated
- public int[] getColors() {
-
- int[] old = new int[mEntries.length];
- for (int i = 0; i < mEntries.length; i++) {
- old[i] = mEntries[i].form == LegendForm.NONE ? ColorTemplate.COLOR_SKIP :
- (mEntries[i].form == LegendForm.EMPTY ? ColorTemplate.COLOR_NONE :
- mEntries[i].formColor);
- }
- return old;
- }
-
- @Deprecated
- public String[] getLabels() {
-
- String[] old = new String[mEntries.length];
- for (int i = 0; i < mEntries.length; i++) {
- old[i] = mEntries[i].label;
- }
- return old;
- }
-
- @Deprecated
- public int[] getExtraColors() {
-
- int[] old = new int[mExtraEntries.length];
- for (int i = 0; i < mExtraEntries.length; i++) {
- old[i] = mExtraEntries[i].form == LegendForm.NONE ? ColorTemplate.COLOR_SKIP :
- (mExtraEntries[i].form == LegendForm.EMPTY ? ColorTemplate.COLOR_NONE :
- mExtraEntries[i].formColor);
- }
- return old;
- }
-
- @Deprecated
- public String[] getExtraLabels() {
-
- String[] old = new String[mExtraEntries.length];
- for (int i = 0; i < mExtraEntries.length; i++) {
- old[i] = mExtraEntries[i].label;
- }
- return old;
- }
-
public LegendEntry[] getExtraEntries() {
return mExtraEntries;
@@ -339,11 +250,6 @@ public class Legend extends ComponentBase {
mExtraEntries = entries;
}
- @Deprecated
- public void setExtra(List<Integer> colors, List<String> labels) {
- setExtra(Utils.convertIntegers(colors), Utils.convertStrings(labels));
- }
-
/**
* Entries that will be appended to the end of the auto calculated
* entries after calculating the legend.