From 623e4724c2007e0fdf1ddb1345df825875f2b4fd Mon Sep 17 00:00:00 2001 From: cpfeiffer Date: Sun, 12 Jul 2015 21:48:48 +0200 Subject: [PATCH] Slightly better text when no data available --- .../activities/AbstractChartFragment.java | 18 ++++++++++-------- app/src/main/res/values/strings.xml | 1 + 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AbstractChartFragment.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AbstractChartFragment.java index 71d32890b..b1ba1818d 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AbstractChartFragment.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AbstractChartFragment.java @@ -15,6 +15,7 @@ import java.util.List; import nodomain.freeyourgadget.gadgetbridge.GBActivitySample; import nodomain.freeyourgadget.gadgetbridge.GBApplication; import nodomain.freeyourgadget.gadgetbridge.GBDevice; +import nodomain.freeyourgadget.gadgetbridge.R; public class AbstractChartFragment extends Fragment { public static final String ACTION_REFRESH @@ -86,27 +87,28 @@ public class AbstractChartFragment extends Fragment { return GBApplication.getActivityDatabaseHandler().getGBActivitySamples(tsFrom, tsTo, provider); } - protected void configureChartDefaults(Chart mChart) { + protected void configureChartDefaults(Chart chart) { // if enabled, the chart will always start at zero on the y-axis + chart.setNoDataText(getString(R.string.chart_no_data_synchronize)); // disable value highlighting - mChart.setHighlightEnabled(false); + chart.setHighlightEnabled(false); // enable touch gestures - mChart.setTouchEnabled(true); + chart.setTouchEnabled(true); } - protected void configureBarLineChartDefaults(BarLineChartBase mChart) { - configureChartDefaults(mChart); + protected void configureBarLineChartDefaults(BarLineChartBase chart) { + configureChartDefaults(chart); // enable scaling and dragging - mChart.setDragEnabled(true); - mChart.setScaleEnabled(true); + chart.setDragEnabled(true); + chart.setScaleEnabled(true); // if disabled, scaling can be done on x- and y-axis separately // mChart.setPinchZoom(true); - mChart.setDrawGridBackground(false); + chart.setDrawGridBackground(false); } protected BarEntry createBarEntry(float value, int index) { diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index b1685f25f..ef8254ea3 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -151,4 +151,5 @@ smart wakeup There was an error setting the alarms, please try again! Alarms sent to device! + No data. Synchronize device?