From fbfc9ed97f3da5f3f6dfb0ad98a2501cfaf0e327 Mon Sep 17 00:00:00 2001 From: cpfeiffer Date: Thu, 29 Sep 2016 22:16:08 +0200 Subject: [PATCH] Workaround for https://github.com/PhilJay/MPAndroidChart/issues/2317 --- .../activities/charts/ActivitySleepChartFragment.java | 2 ++ .../gadgetbridge/activities/charts/SleepChartFragment.java | 1 + .../gadgetbridge/activities/charts/WeekStepsChartFragment.java | 1 + 3 files changed, 4 insertions(+) diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/ActivitySleepChartFragment.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/ActivitySleepChartFragment.java index 7fa0fc667..8bab49416 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/ActivitySleepChartFragment.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/ActivitySleepChartFragment.java @@ -13,6 +13,7 @@ import com.github.mikephil.charting.charts.Chart; import com.github.mikephil.charting.components.LegendEntry; import com.github.mikephil.charting.components.XAxis; import com.github.mikephil.charting.components.YAxis; +import com.github.mikephil.charting.data.CombinedData; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -117,6 +118,7 @@ public class ActivitySleepChartFragment extends AbstractChartFragment { protected void updateChartsnUIThread(ChartsData chartsData) { DefaultChartsData dcd = (DefaultChartsData) chartsData; mChart.getLegend().setTextColor(LEGEND_TEXT_COLOR); + mChart.setData(null); // workaround for https://github.com/PhilJay/MPAndroidChart/issues/2317 mChart.setData(dcd.getCombinedData()); } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/SleepChartFragment.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/SleepChartFragment.java index 69d038a1f..ead1bb1d8 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/SleepChartFragment.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/SleepChartFragment.java @@ -99,6 +99,7 @@ public class SleepChartFragment extends AbstractChartFragment { mSleepAmountChart.setCenterText(mcd.getPieData().getTotalSleep()); mSleepAmountChart.setData(mcd.getPieData().getPieData()); + mActivityChart.setData(null); // workaround for https://github.com/PhilJay/MPAndroidChart/issues/2317 mActivityChart.setData(mcd.getChartsData().getCombinedData()); } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/WeekStepsChartFragment.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/WeekStepsChartFragment.java index 6557c50ea..5eb6a0678 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/WeekStepsChartFragment.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/WeekStepsChartFragment.java @@ -67,6 +67,7 @@ public class WeekStepsChartFragment extends AbstractChartFragment { mTodayStepsChart.setCenterText(NumberFormat.getNumberInstance(mLocale).format(mcd.getDaySteps().totalSteps)); mTodayStepsChart.setData(mcd.getDaySteps().data); + mWeekStepsChart.setData(null); // workaround for https://github.com/PhilJay/MPAndroidChart/issues/2317 mWeekStepsChart.setData(mcd.getWeekBeforeStepsData().getCombinedData()); mWeekStepsChart.getLegend().setEnabled(false); }