nixo
/
GadgetBridge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Upgrade mpandroidchart to 2.2.3

This commit is contained in:
cpfeiffer 2016-03-07 22:45:44 +01:00
parent be012eca8d
commit 25e58eb414
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@ -48,7 +48,7 @@ dependencies {
compile 'com.android.support:support-v4:23.1.1' compile 'com.android.support:support-v4:23.1.1'
compile 'com.github.tony19:logback-android-classic:1.1.1-4' compile 'com.github.tony19:logback-android-classic:1.1.1-4'
compile 'org.slf4j:slf4j-api:1.7.7' compile 'org.slf4j:slf4j-api:1.7.7'
compile 'com.github.PhilJay:MPAndroidChart:v2.1.6' compile 'com.github.PhilJay:MPAndroidChart:v2.2.3'
compile 'com.github.pfichtner:durationformatter:0.1.1' compile 'com.github.pfichtner:durationformatter:0.1.1'
compile 'de.cketti.library.changelog:ckchangelog:1.2.2' compile 'de.cketti.library.changelog:ckchangelog:1.2.2'
} }

3
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/AbstractChartFragment.java
View File

@ -20,6 +20,7 @@ import com.github.mikephil.charting.data.CombinedData;
import com.github.mikephil.charting.data.Entry; import com.github.mikephil.charting.data.Entry;
import com.github.mikephil.charting.data.LineData; import com.github.mikephil.charting.data.LineData;
import com.github.mikephil.charting.data.LineDataSet; import com.github.mikephil.charting.data.LineDataSet;
import com.github.mikephil.charting.interfaces.datasets.IBarDataSet;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -482,7 +483,7 @@ public abstract class AbstractChartFragment extends AbstractGBFragment {
BarDataSet activitySet = createActivitySet(activityEntries, colors, "Activity"); BarDataSet activitySet = createActivitySet(activityEntries, colors, "Activity");
// create a data object with the datasets // create a data object with the datasets
CombinedData combinedData = new CombinedData(xLabels); CombinedData combinedData = new CombinedData(xLabels);
List<BarDataSet> list = new ArrayList<>(); List<IBarDataSet> list = new ArrayList<>();
list.add(activitySet); list.add(activitySet);
BarData barData = new BarData(xLabels, list); BarData barData = new BarData(xLabels, list);
barData.setGroupSpace(0); barData.setGroupSpace(0);