diff --git a/MPChartExample/build.gradle b/MPChartExample/build.gradle
index 2d607e9991..4dc72be95e 100644
--- a/MPChartExample/build.gradle
+++ b/MPChartExample/build.gradle
@@ -1,11 +1,11 @@
 apply plugin: 'com.android.application'
 
 android {
- compileSdkVersion 28
 defaultConfig {
 applicationId "com.xxmassdeveloper.mpchartexample"
+ compileSdk 33
 minSdkVersion 16
- targetSdkVersion 28
+ targetSdkVersion 33
 versionCode 57
 versionName '3.1.0'
 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -17,10 +17,11 @@ android {
 proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
 }
 }
+ namespace 'com.xxmassdeveloper.mpchartexample'
 }
 
 dependencies {
- implementation "androidx.appcompat:appcompat:1.0.2"
- implementation 'com.google.android.material:material:1.0.0'
+ implementation "androidx.appcompat:appcompat:1.6.1"
+ implementation 'com.google.android.material:material:1.9.0'
 implementation project(':MPChartLib')
 }
diff --git a/MPChartExample/src/main/AndroidManifest.xml b/MPChartExample/src/main/AndroidManifest.xml
index 99334e601a..f67419bf07 100644
--- a/MPChartExample/src/main/AndroidManifest.xml
+++ b/MPChartExample/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" - package="com.xxmassdeveloper.mpchartexample">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
 <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
 
@@ -12,6 +11,7 @@
 android:theme="@style/AppTheme">
 <activity android:name="com.xxmassdeveloper.mpchartexample.notimportant.MainActivity" + android:exported="true" android:label="@string/app_name">
 <intent-filter>
 <action android:name="android.intent.action.MAIN" />
diff --git a/MPChartLib/build.gradle b/MPChartLib/build.gradle
index 0fb6dc7036..1e58d9b20d 100644
--- a/MPChartLib/build.gradle
+++ b/MPChartLib/build.gradle
@@ -1,16 +1,12 @@
 apply plugin: 'com.android.library'
-apply plugin: 'com.github.dcendents.android-maven'
 
-group='com.github.philjay'
+group = 'com.github.philjay'
 
 android {
- compileSdkVersion 28
- buildToolsVersion '28.0.3'
 defaultConfig {
+ compileSdk 33
 minSdkVersion 14
- targetSdkVersion 28
- versionCode 3
- versionName '3.1.0'
+ targetSdkVersion 33
 }
 buildTypes {
 release {
@@ -21,27 +17,28 @@ android {
 testOptions {
 unitTests.returnDefaultValues = true // this prevents "not mocked" error
 }
+ namespace 'com.github.mikephil.charting'
 }
 
 dependencies {
- implementation 'androidx.annotation:annotation:1.0.0'
- testImplementation 'junit:junit:4.12'
+ implementation 'androidx.annotation:annotation:1.5.0'
+ testImplementation 'junit:junit:4.13.2'
 }
 
 task sourcesJar(type: Jar) {
 from android.sourceSets.main.java.srcDirs
- classifier = 'sources'
+ archiveClassifier.set("sources")
 }
 
 task javadoc(type: Javadoc) {
 options.charSet = 'UTF-8'
- failOnError false
+ failOnError false
 source = android.sourceSets.main.java.sourceFiles
 classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
 }
 
 task javadocJar(type: Jar, dependsOn: javadoc) {
- classifier = 'javadoc'
+ archiveClassifier.set('javadoc')
 from javadoc.destinationDir
 }
 
diff --git a/MPChartLib/src/main/AndroidManifest.xml b/MPChartLib/src/main/AndroidManifest.xml
index d75f87c7e2..af45ebcb44 100644
--- a/MPChartLib/src/main/AndroidManifest.xml
+++ b/MPChartLib/src/main/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="com.github.mikephil.charting">
+<manifest>
 
 <!-- <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 
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 0926dff244..e6725be4b2 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
@@ -100,6 +100,45 @@ public abstract class BarLineChartBase<t extends BarLineScatterCandleBubbleData< protected boolean mClipValuesToContent = false; + /** + * flag that indicates if draw highlight point is enabled or not + */ + protected boolean isDrawHighlightPoint = false; + + /** + * the highlight point inner radius (px) + */ + protected int mHighLightPointInnerRadius = 1; + + /** + * the highlight point stroke width (px) + */ + protected int mHighLightPointStrokeWidth = 1; + + public boolean isDrawHighlightPoint() { + return isDrawHighlightPoint; + } + + public void setDrawHighlightPoint(boolean drawHighlightPoint) { + isDrawHighlightPoint = drawHighlightPoint; + } + + public int getHighLightPointInnerRadius() { + return mHighLightPointInnerRadius; + } + + public void setHighLightPointInnerRadius(int mHighLightPointStrokeWidth) { + this.mHighLightPointInnerRadius = mHighLightPointStrokeWidth; + } + + public int getHighLightPointStrokeWidth() { + return mHighLightPointStrokeWidth; + } + + public void setHighLightPointStrokeWidth(int mHighLightPointStrokeWidth) { + this.mHighLightPointStrokeWidth = mHighLightPointStrokeWidth; + } + protected boolean mClipDataToContent = true; /** @@ -250,13 +289,13 @@ protected void onDraw(Canvas canvas) { if (!mAxisRight.isDrawGridLinesBehindDataEnabled()) mAxisRendererRight.renderGridLines(canvas); + // Removes clipping rectangle + canvas.restoreToCount(clipRestoreCount); + // if highlighting is enabled if (valuesToHighlight()) mRenderer.drawHighlighted(canvas, mIndicesToHighlight); - // Removes clipping rectangle - canvas.restoreToCount(clipRestoreCount); - mRenderer.drawExtras(canvas); if (mXAxis.isEnabled() && !mXAxis.isDrawLimitLinesBehindDataEnabled()) 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 5cf49ea9d1..32e9acdc9c 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 @@ -36,7 +36,6 @@ import com.github.mikephil.charting.data.Entry; import com.github.mikephil.charting.formatter.DefaultValueFormatter; import com.github.mikephil.charting.formatter.IValueFormatter; -import com.github.mikephil.charting.highlight.ChartHighlighter; import com.github.mikephil.charting.highlight.Highlight; import com.github.mikephil.charting.highlight.IHighlighter; import com.github.mikephil.charting.interfaces.dataprovider.ChartInterface; @@ -1492,7 +1491,7 @@ public IHighlighter getHighlighter() { * * @param highlighter */ - public void setHighlighter(ChartHighlighter highlighter) { + public void setHighlighter(IHighlighter highlighter) { mHighlighter = highlighter; } diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/components/AxisBase.java b/MPChartLib/src/main/java/com/github/mikephil/charting/components/AxisBase.java index c90b4fc9b9..2cd56cb571 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/components/AxisBase.java +++ b/MPChartLib/src/main/java/com/github/mikephil/charting/components/AxisBase.java @@ -6,6 +6,7 @@ import android.util.Log; import com.github.mikephil.charting.formatter.DefaultAxisValueFormatter; +import com.github.mikephil.charting.formatter.IAxisStyleFormatter; import com.github.mikephil.charting.formatter.IAxisValueFormatter; import com.github.mikephil.charting.utils.Utils; @@ -24,6 +25,8 @@ public abstract class AxisBase extends ComponentBase { */ protected IAxisValueFormatter mAxisValueFormatter; + protected IAxisStyleFormatter mAxisLabelStyleFormatter; + private int mGridColor = Color.GRAY; private float mGridLineWidth = 1f; @@ -554,6 +557,18 @@ public IAxisValueFormatter getValueFormatter() { return mAxisValueFormatter; } + + public void setAxisLabelStyleFormatter(IAxisStyleFormatter f) { + mAxisLabelStyleFormatter = f; + } + + public IAxisStyleFormatter getAxisLabelStyleFormatter() { + // return null if not set + if(mAxisLabelStyleFormatter == null) + return null; + return mAxisLabelStyleFormatter; + } + /** * Enables the grid line to be drawn in dashed mode, e.g. like this * "- - - - - -". THIS ONLY WORKS IF HARDWARE-ACCELERATION IS TURNED OFF. diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/components/YAxis.java b/MPChartLib/src/main/java/com/github/mikephil/charting/components/YAxis.java index d2071ec5a8..6efdb27371 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/components/YAxis.java +++ b/MPChartLib/src/main/java/com/github/mikephil/charting/components/YAxis.java @@ -104,6 +104,12 @@ public enum YAxisLabelPosition { */ protected float mMaxWidth = Float.POSITIVE_INFINITY; + protected Boolean mDrawStaticCenterVerticalLine = false; + + protected int mStaticCenterVerticalLineColor = Color.GRAY; + + protected float mStaticCenterVerticalLineWidth = 1f; + /** * Enum that specifies the axis a DataSet should be plotted against, either LEFT or RIGHT. * @@ -334,6 +340,30 @@ public void setZeroLineWidth(float width) { this.mZeroLineWidth = Utils.convertDpToPixel(width); } + public Boolean isDrawStaticCenterVerticalLineEnabled() { + return mDrawStaticCenterVerticalLine; + } + + public void setDrawStaticCenterVerticalLine(Boolean enabled) { + this.mDrawStaticCenterVerticalLine = enabled; + } + + public int getStaticCenterVerticalLineColor() { + return mStaticCenterVerticalLineColor; + } + + public void setStaticCenterVerticalLineColor(int color) { + this.mStaticCenterVerticalLineColor = color; + } + + public float getStaticCenterVerticalLineWidth() { + return mStaticCenterVerticalLineWidth; + } + + public void setStaticCenterVerticalLineWidth(float width) { + this.mStaticCenterVerticalLineWidth = Utils.convertDpToPixel(width); + } + /** * This is for normal (not horizontal) charts horizontal spacing. * @@ -392,7 +422,7 @@ public boolean needsOffset() { * Returns true if autoscale restriction for axis min value is enabled */ @Deprecated - public boolean isUseAutoScaleMinRestriction( ) { + public boolean isUseAutoScaleMinRestriction() { return mUseAutoScaleRestrictionMin; } @@ -400,7 +430,7 @@ public boolean isUseAutoScaleMinRestriction( ) { * Sets autoscale restriction for axis min value as enabled/disabled */ @Deprecated - public void setUseAutoScaleMinRestriction( boolean isEnabled ) { + public void setUseAutoScaleMinRestriction(boolean isEnabled) { mUseAutoScaleRestrictionMin = isEnabled; } @@ -416,7 +446,7 @@ public boolean isUseAutoScaleMaxRestriction() { * Sets autoscale restriction for axis max value as enabled/disabled */ @Deprecated - public void setUseAutoScaleMaxRestriction( boolean isEnabled ) { + public void setUseAutoScaleMaxRestriction(boolean isEnabled) { mUseAutoScaleRestrictionMax = isEnabled; } @@ -429,20 +459,14 @@ public void calculate(float dataMin, float dataMax) { // Make sure max is greater than min // Discussion: https://github.com/danielgindi/Charts/pull/3650#discussion_r221409991 - if (min> max)
- {
- if (mCustomAxisMax && mCustomAxisMin)
- {
+ if (min> max) {
+ if (mCustomAxisMax && mCustomAxisMin) {
 float t = min;
 min = max;
 max = t;
- }
- else if (mCustomAxisMax)
- {
+ } else if (mCustomAxisMax) {
 min = max < 0f ? max * 1.5f : max * 0.5f; - } - else if (mCustomAxisMin) - { + } else if (mCustomAxisMin) { max = min < 0f ? min * 0.5f : min * 1.5f; } } diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/data/LineDataSet.java b/MPChartLib/src/main/java/com/github/mikephil/charting/data/LineDataSet.java index 10d1837ecd..59dde8088c 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/data/LineDataSet.java +++ b/MPChartLib/src/main/java/com/github/mikephil/charting/data/LineDataSet.java @@ -1,4 +1,3 @@ - package com.github.mikephil.charting.data; import android.content.Context; @@ -22,6 +21,21 @@ public class LineDataSet extends LineRadarDataSet<entry> implements ILineDataSet
 **/
 private LineDataSet.Mode mMode = Mode.LINEAR;
 
+ /**
+ * Is Gradient on the line enabled
+ */
+ private Boolean mIsGradientEnabled = false;
+
+ /**
+ * Custom colors for the gradient if enabled
+ */
+ private int[] mGradientColors = null;
+
+ /**
+ * Custom positions for gradient colors
+ */
+ private float[] mGradientPositions = null;
+
 /**
 * List representing all colors that are used for the circles
 */
@@ -105,6 +119,9 @@ protected void copy(LineDataSet lineDataSet) {
 lineDataSet.mDrawCircles = mDrawCircleHole;
 lineDataSet.mFillFormatter = mFillFormatter;
 lineDataSet.mMode = mMode;
+ lineDataSet.mIsGradientEnabled = mIsGradientEnabled;
+ lineDataSet.mGradientColors = mGradientColors;
+ lineDataSet.mGradientPositions = mGradientPositions;
 }
 
 /**
@@ -268,6 +285,45 @@ public boolean isDrawSteppedEnabled() {
 return mMode == Mode.STEPPED;
 }
 
+ @Override
+ public boolean isGradientEnabled() {
+ return mIsGradientEnabled;
+ }
+
+ /**
+ * Sets custom colors for gradient.
+ * If not set, default gradient will be used
+ * @param colors Array of colors for gradient
+ */
+ public void setGradientColors(int[] colors) {
+ this.mGradientColors = colors;
+ }
+
+ /**
+ * @return Custom gradient colors or null if not set
+ */
+ @Override
+ public int[] getGradientColors() {
+ return mGradientColors;
+ }
+
+ /**
+ * Sets custom positions for gradient colors.
+ * Values should be in range 0.0 - 1.0
+ * @param positions Array of positions for gradient colors
+ */
+ public void setGradientPositions(float[] positions) {
+ this.mGradientPositions = positions;
+ }
+
+ /**
+ * @return Custom gradient positions or null if not set
+ */
+ @Override
+ public float[] getGradientPositions() {
+ return mGradientPositions;
+ }
+
 /** ALL CODE BELOW RELATED TO CIRCLE-COLORS */
 
 /**
@@ -408,6 +464,10 @@ public IFillFormatter getFillFormatter() {
 return mFillFormatter;
 }
 
+ public void setIsGradientEnabled(Boolean mIsGradientEnabled) {
+ this.mIsGradientEnabled = mIsGradientEnabled;
+ }
+
 public enum Mode {
 LINEAR,
 STEPPED,
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/formatter/IAxisStyleFormatter.java b/MPChartLib/src/main/java/com/github/mikephil/charting/formatter/IAxisStyleFormatter.java
new file mode 100644
index 0000000000..63804cafb5
--- /dev/null
+++ b/MPChartLib/src/main/java/com/github/mikephil/charting/formatter/IAxisStyleFormatter.java
@@ -0,0 +1,30 @@
+package com.github.mikephil.charting.formatter;
+
+import android.graphics.Typeface;
+
+import com.github.mikephil.charting.components.AxisBase;
+
+public interface IAxisStyleFormatter {
+ /**
+ * Called when a value from an axis is to be formatted visually ( typeface, textSize, color, etc. ).
+ * before being drawn. For performance reasons, avoid excessive calculations
+ * and memory allocations inside this method.
+ *
+ * @param value the value to be formatted
+ * @param axis the axis the value belongs to
+ * @return
+ */
+ Typeface getTypefaceForAxisValue(float value, AxisBase axis);
+
+ /**
+ * Called when a value from an axis is to be formatted visually ( typeface, textSize, color, etc. ).
+ * before being drawn. For performance reasons, avoid excessive calculations
+ * and memory allocations inside this method.
+ *
+ * @param value the value to be formatted
+ * @param axis the axis the value belongs to
+ * @return
+ */
+ int getTextColorForAxisValue(float value, AxisBase axis);
+}
+
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/interfaces/datasets/ILineDataSet.java b/MPChartLib/src/main/java/com/github/mikephil/charting/interfaces/datasets/ILineDataSet.java
index 3f534fe848..eca1a90ec5 100644
--- a/MPChartLib/src/main/java/com/github/mikephil/charting/interfaces/datasets/ILineDataSet.java
+++ b/MPChartLib/src/main/java/com/github/mikephil/charting/interfaces/datasets/ILineDataSet.java
@@ -94,10 +94,30 @@ public interface ILineDataSet extends ILineRadarDataSet<entry> {
 */
 boolean isDashedLineEnabled();
 
+ /**
+ *
+ * @return True if the gradient is enabled, false if not.
+ */
+ boolean isGradientEnabled();
+
+ /**
+ * Returns custom gradient colors if set
+ *
+ * @return array of colors for gradient or null if not set
+ */
+ int[] getGradientColors();
+
+ /**
+ * Returns custom gradient positions if set
+ *
+ * @return array of positions for gradient colors or null if not set
+ */
+ float[] getGradientPositions();
+
 /**
 * Returns the IFillFormatter that is set for this DataSet.
 *
 * @return
 */
 IFillFormatter getFillFormatter();
-}
\ No newline at end of file
+}
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/jobs/AnimatedMoveViewJob.java b/MPChartLib/src/main/java/com/github/mikephil/charting/jobs/AnimatedMoveViewJob.java
index 8f953a06aa..cfc8d1b250 100644
--- a/MPChartLib/src/main/java/com/github/mikephil/charting/jobs/AnimatedMoveViewJob.java
+++ b/MPChartLib/src/main/java/com/github/mikephil/charting/jobs/AnimatedMoveViewJob.java
@@ -36,6 +36,15 @@ public static AnimatedMoveViewJob getInstance(ViewPortHandler viewPortHandler, f
 }
 
 public static void recycleInstance(AnimatedMoveViewJob instance){
+ // Clear reference avoid memory leak
+ instance.mViewPortHandler = null;
+ instance.xValue = 0f;
+ instance.yValue = 0f;
+ instance.mTrans = null;
+ instance.view = null;
+ instance.xOrigin = 0f;
+ instance.yOrigin = 0f;
+ instance.animator.setDuration(0);
 pool.recycle(instance);
 }
 
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/jobs/MoveViewJob.java b/MPChartLib/src/main/java/com/github/mikephil/charting/jobs/MoveViewJob.java
index 46b56b1347..7e0dacdf3b 100644
--- a/MPChartLib/src/main/java/com/github/mikephil/charting/jobs/MoveViewJob.java
+++ b/MPChartLib/src/main/java/com/github/mikephil/charting/jobs/MoveViewJob.java
@@ -29,7 +29,13 @@ public static MoveViewJob getInstance(ViewPortHandler viewPortHandler, float xVa
 return result;
 }
 
- public static void recycleInstance(MoveViewJob instance){
+ public static void recycleInstance(MoveViewJob instance) {
+ // Clear reference avoid memory leak
+ instance.mViewPortHandler = null;
+ instance.xValue = 0f;
+ instance.yValue = 0f;
+ instance.mTrans = null;
+ instance.view = null;
 pool.recycle(instance);
 }
 
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/jobs/ZoomJob.java b/MPChartLib/src/main/java/com/github/mikephil/charting/jobs/ZoomJob.java
index c39586ca87..c4098ea0b7 100644
--- a/MPChartLib/src/main/java/com/github/mikephil/charting/jobs/ZoomJob.java
+++ b/MPChartLib/src/main/java/com/github/mikephil/charting/jobs/ZoomJob.java
@@ -37,6 +37,15 @@ public static ZoomJob getInstance(ViewPortHandler viewPortHandler, float scaleX,
 }
 
 public static void recycleInstance(ZoomJob instance) {
+ // Clear reference avoid memory leak
+ instance.xValue = 0f;
+ instance.yValue = 0f;
+ instance.scaleX = 0f;
+ instance.scaleY = 0f;
+ instance.mViewPortHandler = null;
+ instance.mTrans = null;
+ instance.axisDependency = null;
+ instance.view = null;
 pool.recycle(instance);
 }
 
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/listener/BarLineChartTouchListener.java b/MPChartLib/src/main/java/com/github/mikephil/charting/listener/BarLineChartTouchListener.java
index 5685d32fa0..ab41cabf85 100644
--- a/MPChartLib/src/main/java/com/github/mikephil/charting/listener/BarLineChartTouchListener.java
+++ b/MPChartLib/src/main/java/com/github/mikephil/charting/listener/BarLineChartTouchListener.java
@@ -74,6 +74,13 @@ public class BarLineChartTouchListener extends ChartTouchListener<barlinechartba */ private float mMinScalePointerDistance; + /** + * Only highlight after long press + */ + private boolean mHighlightOnLongPress = false; + + private int lastMotionEventAction = -1; + /** * Constructor with initialization parameters. * @@ -95,6 +102,7 @@ public BarLineChartTouchListener(BarLineChartBase<? extends BarLineScatterCandle @SuppressLint("ClickableViewAccessibility") @Override public boolean onTouch(View v, MotionEvent event) { + lastMotionEventAction = event.getAction(); if (mVelocityTracker == null) { mVelocityTracker = VelocityTracker.obtain(); @@ -177,9 +185,7 @@ public boolean onTouch(View v, MotionEvent event) { } else if (mTouchMode == X_ZOOM &#124;&#124; mTouchMode == Y_ZOOM &#124;&#124; mTouchMode == PINCH_ZOOM) { mChart.disableScroll(); - - if (mChart.isScaleXEnabled() &#124;&#124; mChart.isScaleYEnabled()) - performZoom(event); + performZoom(event); } else if (mTouchMode == NONE && Math.abs(distance(event.getX(), mTouchStartPoint.x, event.getY(), @@ -187,8 +193,8 @@ public boolean onTouch(View v, MotionEvent event) { if (mChart.isDragEnabled()) { - boolean shouldPan = !mChart.isFullyZoomedOut() &#124;&#124; - !mChart.hasNoDragOffset(); + boolean shouldPan = (!mChart.isFullyZoomedOut() &#124;&#124; !mChart.hasNoDragOffset()) + && (!mHighlightOnLongPress &#124;&#124; (mLastGesture != ChartGesture.LONG_PRESS && mLastHighlighted == null)); if (shouldPan) { @@ -204,12 +210,13 @@ public boolean onTouch(View v, MotionEvent event) { } } else { - if (mChart.isHighlightPerDragEnabled()) { - mLastGesture = ChartGesture.DRAG; + if (!mHighlightOnLongPress &#124;&#124; mLastGesture == ChartGesture.LONG_PRESS &#124;&#124; mLastHighlighted != null) { + mLastGesture = ChartGesture.DRAG; - if (mChart.isHighlightPerDragEnabled()) - performHighlightDrag(event); + if (mChart.isHighlightPerDragEnabled()) + performHighlightDrag(event); + } } } @@ -288,6 +295,10 @@ public boolean onTouch(View v, MotionEvent event) { return true; // indicate event was handled } + public void setHighlightOnLongPress(boolean enabled) { + mHighlightOnLongPress = enabled; + } + /** * ################ ################ ################ ################ */ @@ -365,6 +376,8 @@ private void performZoom(MotionEvent event) { float scale = totalDist / mSavedDist; // total scale boolean isZoomingOut = (scale < 1); + if (l != null) + l.onChartZoom(isZoomingOut); boolean canZoomMoreX = isZoomingOut ? h.canZoomOutMoreX() : @@ -377,13 +390,15 @@ private void performZoom(MotionEvent event) { float scaleX = (mChart.isScaleXEnabled()) ? scale : 1f; float scaleY = (mChart.isScaleYEnabled()) ? scale : 1f; - if (canZoomMoreY &#124;&#124; canZoomMoreX) { + if (mChart.isScaleXEnabled() &#124;&#124; mChart.isScaleYEnabled()) { + if (canZoomMoreY &#124;&#124; canZoomMoreX) { - mMatrix.set(mSavedMatrix); - mMatrix.postScale(scaleX, scaleY, t.x, t.y); + mMatrix.set(mSavedMatrix); + mMatrix.postScale(scaleX, scaleY, t.x, t.y); - if (l != null) - l.onChartScale(event, scaleX, scaleY); + if (l != null) + l.onChartScale(event, scaleX, scaleY); + } } } else if (mTouchMode == X_ZOOM && mChart.isScaleXEnabled()) { @@ -601,14 +616,16 @@ public boolean onDoubleTap(MotionEvent e) { @Override public void onLongPress(MotionEvent e) { + if (lastMotionEventAction == MotionEvent.ACTION_DOWN) { + performHighlightDrag(e); + mLastGesture = ChartGesture.LONG_PRESS; - mLastGesture = ChartGesture.LONG_PRESS; - - OnChartGestureListener l = mChart.getOnChartGestureListener(); + OnChartGestureListener l = mChart.getOnChartGestureListener(); - if (l != null) { + if (l != null) { - l.onChartLongPressed(e); + l.onChartLongPressed(e); + } } } diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/listener/OnChartGestureListener.java b/MPChartLib/src/main/java/com/github/mikephil/charting/listener/OnChartGestureListener.java index da0c5ed180..8890fec8ac 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/listener/OnChartGestureListener.java +++ b/MPChartLib/src/main/java/com/github/mikephil/charting/listener/OnChartGestureListener.java @@ -73,4 +73,11 @@ public interface OnChartGestureListener { * @param dY translation distance on the y-axis */ void onChartTranslate(MotionEvent me, float dX, float dY); + + /** + * Callbacks when a zoom gesture on the chart has been detected. + * + * @param zoomingOut Zoom direction, outwards or inwards. + */ + void onChartZoom(Boolean zoomingOut); } diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/LineChartRenderer.java b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/LineChartRenderer.java index a86c16f76b..4bf86828a2 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/LineChartRenderer.java +++ b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/LineChartRenderer.java @@ -3,8 +3,11 @@ import android.graphics.Bitmap; import android.graphics.Canvas; import android.graphics.Color; +import android.graphics.LinearGradient; import android.graphics.Paint; import android.graphics.Path; +import android.graphics.RectF; +import android.graphics.Shader; import android.graphics.drawable.Drawable; import com.github.mikephil.charting.animation.ChartAnimator; @@ -172,7 +175,43 @@ protected void drawHorizontalBezier(ILineDataSet dataSet) { drawCubicFill(mBitmapCanvas, dataSet, cubicFillPath, trans, mXBounds); } - mRenderPaint.setColor(dataSet.getColor()); + // Get the viewport bounds + RectF viewportRect = this.mViewPortHandler.getContentRect(); + + // Apply gradient only if enabled + if (dataSet.isGradientEnabled()) { + int baseColor = dataSet.getColor(); + int[] colors; + float[] positions; + + // Check if custom gradient colors are provided + if (dataSet.getGradientColors() != null && dataSet.getGradientColors().length>= 2) {
+ // Use custom gradient colors
+ colors = dataSet.getGradientColors();
+ positions = dataSet.getGradientPositions();
+ } else {
+ // Use default gradient based on the base color
+ int leftColor = Color.argb(0, Color.red(baseColor), Color.green(baseColor), Color.blue(baseColor));
+ int leftColor2 = Color.argb(80, Color.red(baseColor), Color.green(baseColor), Color.blue(baseColor));
+
+ colors = new int[]{leftColor, leftColor2, baseColor};
+ positions = null; // Default to equal distribution
+ }
+
+ LinearGradient gradient = new LinearGradient(
+ viewportRect.left, 0,
+ viewportRect.right, 0,
+ colors,
+ positions,
+ Shader.TileMode.CLAMP
+ );
+
+ mRenderPaint.setShader(gradient);
+ } else {
+ // Use solid color if gradient not enabled
+ mRenderPaint.setColor(dataSet.getColor());
+ mRenderPaint.setShader(null);
+ }
 
 mRenderPaint.setStyle(Paint.Style.STROKE);
 
@@ -591,8 +630,8 @@ public void drawValues(Canvas c) {
 Utils.drawImage(
 c,
 icon,
- (int)(x + iconsOffset.x),
- (int)(y + iconsOffset.y),
+ (int) (x + iconsOffset.x),
+ (int) (y + iconsOffset.y),
 icon.getIntrinsicWidth(),
 icon.getIntrinsicHeight());
 }
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/XAxisRenderer.java b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/XAxisRenderer.java
index 8adb56c73a..2b1e4f578b 100644
--- a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/XAxisRenderer.java
+++ b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/XAxisRenderer.java
@@ -7,10 +7,12 @@
 import android.graphics.Paint.Align;
 import android.graphics.Path;
 import android.graphics.RectF;
+import android.graphics.Typeface;
 
 import com.github.mikephil.charting.components.LimitLine;
 import com.github.mikephil.charting.components.XAxis;
 import com.github.mikephil.charting.components.XAxis.XAxisPosition;
+import com.github.mikephil.charting.formatter.IAxisStyleFormatter;
 import com.github.mikephil.charting.utils.FSize;
 import com.github.mikephil.charting.utils.MPPointD;
 import com.github.mikephil.charting.utils.MPPointF;
@@ -204,6 +206,23 @@ protected void drawLabels(Canvas c, float pos, MPPointF anchor) {
 
 String label = mXAxis.getValueFormatter().getFormattedValue(mXAxis.mEntries[i / 2], mXAxis);
 
+ // get the custom axis label style formatter if set
+ IAxisStyleFormatter axisLabelStyleFormatter = mXAxis.getAxisLabelStyleFormatter();
+
+ if(axisLabelStyleFormatter != null) {
+ // get label Text Style
+ Typeface tf = axisLabelStyleFormatter.getTypefaceForAxisValue( mXAxis.mEntries[i / 2], mXAxis);
+ if (tf != null) {
+ mAxisLabelPaint.setTypeface(tf);
+ }
+
+ // get label text color
+ int color = axisLabelStyleFormatter.getTextColorForAxisValue( mXAxis.mEntries[i / 2], mXAxis);
+ if (color != 0) {
+ mAxisLabelPaint.setColor(color);
+ }
+ }
+
 if (mXAxis.isAvoidFirstLastClippingEnabled()) {
 
 // avoid clipping of the last
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/YAxisRenderer.java b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/YAxisRenderer.java
index 53cca7ee03..7da5731a9b 100644
--- a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/YAxisRenderer.java
+++ b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/YAxisRenderer.java
@@ -24,6 +24,8 @@ public class YAxisRenderer extends AxisRenderer {
 
 protected Paint mZeroLinePaint;
 
+ protected Paint mCenterLinePaint;
+
 public YAxisRenderer(ViewPortHandler viewPortHandler, YAxis yAxis, Transformer trans) {
 super(viewPortHandler, trans, yAxis);
 
@@ -38,6 +40,11 @@ public YAxisRenderer(ViewPortHandler viewPortHandler, YAxis yAxis, Transformer t
 mZeroLinePaint.setColor(Color.GRAY);
 mZeroLinePaint.setStrokeWidth(1f);
 mZeroLinePaint.setStyle(Paint.Style.STROKE);
+
+ mCenterLinePaint = new Paint(Paint.ANTI_ALIAS_FLAG);
+ mCenterLinePaint.setColor(Color.GRAY);
+ mCenterLinePaint.setStrokeWidth(1f);
+ mCenterLinePaint.setStyle(Paint.Style.STROKE);
 }
 }
 
@@ -168,6 +175,10 @@ public void renderGridLines(Canvas c) {
 if (mYAxis.isDrawZeroLineEnabled()) {
 drawZeroLine(c);
 }
+
+ if(mYAxis.isDrawStaticCenterVerticalLineEnabled()) {
+ drawCenteredHighlightLine(c);
+ }
 }
 
 protected RectF mGridClippingRect = new RectF();
@@ -349,4 +360,14 @@ public void renderLimitLines(Canvas c) {
 c.restoreToCount(clipRestoreCount);
 }
 }
+
+ public void drawCenteredHighlightLine(Canvas c) {
+ // change paint configuration to values from yAxis
+ mCenterLinePaint.setColor(mYAxis.getStaticCenterVerticalLineColor());
+ mCenterLinePaint.setStrokeWidth(mYAxis.getStaticCenterVerticalLineWidth());
+ // draw a vertical line at the center of the screen
+ c.drawLine(mViewPortHandler.getChartWidth() / 2f, mViewPortHandler.offsetTop(),
+ mViewPortHandler.getChartWidth() / 2f, mViewPortHandler.getChartHeight() - mViewPortHandler.offsetBottom(),
+ mCenterLinePaint);
+ }
 }
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/utils/ObjectPool.java b/MPChartLib/src/main/java/com/github/mikephil/charting/utils/ObjectPool.java
index d1d54371f9..ed1d514706 100644
--- a/MPChartLib/src/main/java/com/github/mikephil/charting/utils/ObjectPool.java
+++ b/MPChartLib/src/main/java/com/github/mikephil/charting/utils/ObjectPool.java
@@ -117,6 +117,7 @@ public synchronized T get(){
 }
 
 T result = (T)objects[this.objectsPointer];
+ objects[this.objectsPointer] = null;
 result.currentOwnerId = Poolable.NO_OWNER;
 this.objectsPointer--;
 
@@ -215,4 +216,4 @@ public static abstract class Poolable{
 protected abstract Poolable instantiate();
 
 }
-}
\ No newline at end of file
+}
diff --git a/build.gradle b/build.gradle
index cee7a83e80..1c619298dd 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,17 +1,16 @@
 buildscript {
 repositories {
- jcenter()
+ mavenCentral()
 google()
 }
 dependencies {
- classpath 'com.android.tools.build:gradle:3.4.0'
- classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
+ classpath 'com.android.tools.build:gradle:8.0.1'
 }
 }
 
 allprojects {
 repositories {
- jcenter()
+ mavenCentral()
 google()
 }
 }
diff --git a/gradle.properties b/gradle.properties
index 0c0632ee2f..964eb36626 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,3 +1,6 @@
+android.defaults.buildfeatures.buildconfig=true
 android.enableJetifier=true
+android.nonFinalResIds=false
+android.nonTransitiveRClass=false
 android.useAndroidX=true
-org.gradle.jvmargs=-Xmx2048M
+org.gradle.jvmargs=-Xmx8g -XX:MaxMetaspaceSize=1g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 0f8bc4e375..31a17109e3 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Sat Apr 27 15:48:29 CEST 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
diff --git a/settings.gradle b/settings.gradle
index 32efe09de1..7d3cd868ac 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -5,3 +5,4 @@ include 'MPChartExample'
 //project(':MPChartLib-Realm').projectDir = new File('../MPAndroidChart-Realm/MPChartLib-Realm')
 
 
+
</div><div class="naked_ctrl">
<form action="/index.cgi/contrast" method="get" name="gate">
<p><a href="http://altstyle.alfasado.net">AltStyle</a> によって変換されたページ <a href="https://github.com/PhilJay/MPAndroidChart/compare/master...foldmoney:MPAndroidChart:master.diff">(-&gt;オリジナル)</a>
/ <label>アドレス: <input type="text" name="naked_post_url" value="https://github.com/PhilJay/MPAndroidChart/compare/master...foldmoney:MPAndroidChart:master.diff" size="22" /></label> <label>モード: <select name="naked_post_mode">
<option value="default">デフォルト</option>
<option value="speech">音声ブラウザ</option>
<option value="ruby">ルビ付き</option>
<option value="contrast" selected="selected">配色反転</option>
<option value="larger-text">文字拡大</option>
<option value="mobile">モバイル</option>
</select>
<input type="submit" value="表示" />
</p>
</form>
</div>