From 1d79c9d93d57fcb9991c83a3785d9ef70af76dc4 Mon Sep 17 00:00:00 2001 From: cpfeiffer Date: Thu, 18 May 2017 23:26:04 +0200 Subject: [PATCH] Dark theme: set some text colors for the speed zone tab --- .../activities/charts/StatsChartFragment.java | 15 +++++++++++++-- app/src/main/res/values/strings.xml | 2 +- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/StatsChartFragment.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/StatsChartFragment.java index 952b53c6..181508d9 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/StatsChartFragment.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/StatsChartFragment.java @@ -26,6 +26,7 @@ import com.github.mikephil.charting.charts.Chart; import com.github.mikephil.charting.charts.HorizontalBarChart; 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.BarData; import com.github.mikephil.charting.data.BarDataSet; import com.github.mikephil.charting.data.BarEntry; @@ -43,6 +44,8 @@ import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice; import nodomain.freeyourgadget.gadgetbridge.model.ActivityKind; import nodomain.freeyourgadget.gadgetbridge.model.ActivitySample; +import static android.R.attr.x; + public class StatsChartFragment extends AbstractChartFragment { protected static final Logger LOG = LoggerFactory.getLogger(StatsChartFragment.class); @@ -53,15 +56,16 @@ public class StatsChartFragment extends AbstractChartFragment { protected ChartsData refreshInBackground(ChartsHost chartsHost, DBHandler db, GBDevice device) { List samples = getSamples(db, device); - MySpeedZonesData mySpeedZonesData = refreshSleepAmounts(samples); + MySpeedZonesData mySpeedZonesData = refreshStats(samples); return new MyChartsData(mySpeedZonesData); } - private MySpeedZonesData refreshSleepAmounts(List samples) { + private MySpeedZonesData refreshStats(List samples) { ActivityAnalysis analysis = new ActivityAnalysis(); analysis.calculateActivityAmounts(samples); BarData data = new BarData(); + data.setValueTextColor(CHART_TEXT_COLOR); List entries = new ArrayList<>(); XAxisValueFormatter customXAxis = new XAxisValueFormatter(); @@ -73,6 +77,7 @@ public class StatsChartFragment extends AbstractChartFragment { } BarDataSet set = new BarDataSet(entries, ""); + set.setValueTextColor(CHART_TEXT_COLOR); set.setColors(getColorFor(ActivityKind.TYPE_ACTIVITY)); //set.setDrawValues(false); //data.setBarWidth(0.1f); @@ -121,6 +126,12 @@ public class StatsChartFragment extends AbstractChartFragment { mStatsChart.getLegend().setEnabled(false); mStatsChart.setTouchEnabled(false); mStatsChart.getDescription().setText(""); + + XAxis x = mStatsChart.getXAxis(); + x.setTextColor(CHART_TEXT_COLOR); + + YAxis yr = mStatsChart.getAxisRight(); + yr.setTextColor(CHART_TEXT_COLOR); } @Override diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 6bcba5bb..996f7015 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -258,7 +258,7 @@ Navigation Social Network - Speed zones + Speed Zones Total minutes Steps per minute