Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 0 additions & 52 deletions .idea/runConfigurations/MPChartExample.xml

This file was deleted.

10 changes: 6 additions & 4 deletions MPChartExample/build.gradle
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 28
compileSdkVersion 33
defaultConfig {
applicationId "com.xxmassdeveloper.mpchartexample"
minSdkVersion 16
targetSdkVersion 28
minSdkVersion 23
targetSdkVersion 33
versionCode 57
versionName '3.1.0'
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
Expand All @@ -18,7 +18,9 @@ android {
}
}
}

task wrapper(type: Wrapper){
gradleVersion = '7.2'
}
dependencies {
implementation "androidx.appcompat:appcompat:1.0.2"
implementation 'com.google.android.material:material:1.0.0'
Expand Down
Binary file added MPChartExample/gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
5 changes: 5 additions & 0 deletions MPChartExample/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
172 changes: 172 additions & 0 deletions MPChartExample/gradlew

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

84 changes: 84 additions & 0 deletions MPChartExample/gradlew.bat

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion MPChartExample/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@
android:theme="@style/AppTheme">
<activity
android:name="com.xxmassdeveloper.mpchartexample.notimportant.MainActivity"
android:label="@string/app_name" >
android:label="@string/app_name"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<action android:name="android.intent.action.VIEW" />
Expand Down
6 changes: 3 additions & 3 deletions MPChartLib/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ apply plugin: 'com.github.dcendents.android-maven'
group='com.github.philjay'

android {
compileSdkVersion 28
compileSdkVersion 33
buildToolsVersion '28.0.3'
defaultConfig {
minSdkVersion 14
targetSdkVersion 28
minSdkVersion 23
targetSdkVersion 33
versionCode 3
versionName '3.1.0'
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -791,6 +791,10 @@ protected void drawMarkers(Canvas canvas) {
IDataSet set = mData.getDataSetByIndex(highlight.getDataSetIndex());

Entry e = mData.getEntryForHighlight(mIndicesToHighlight[i]);

if(e==null || set==null)
continue;

int entryIndex = set.getEntryIndex(e);

// make sure entry not null
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,8 @@ protected void drawMarkers(Canvas canvas) {
IDataSet set = mData.getDataSetByHighlight(highlight);

Entry e = mData.getEntryForHighlight(highlight);
if (e == null)

if(e==null || set==null)
continue;

int entryIndex = set.getEntryIndex(e);
Expand Down
Binary file added MPChartLib_Release/MPChartLib-debug_20221121.aar
Binary file not shown.
Loading