From 9a8fef2a1b325c62c8d5fada5660e6383adf9e91 Mon Sep 17 00:00:00 2001
From: Dikay900 <dark900@xyz.de>
Date: Sat, 15 Sep 2018 19:44:24 +0200
Subject: [PATCH] selectable which activity data will be shown on diagrams -
 activity or steps

---
 .../activities/charts/AbstractChartFragment.java      | 11 +++++++++--
 .../activities/charts/ActivitySleepChartFragment.java |  2 +-
 .../freeyourgadget/gadgetbridge/util/GBPrefs.java     |  1 +
 app/src/main/res/values/arrays.xml                    |  9 +++++++++
 app/src/main/res/values/strings.xml                   |  3 +++
 app/src/main/res/xml/preferences.xml                  |  8 ++++++++
 6 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/AbstractChartFragment.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/AbstractChartFragment.java
index d6db6f5eaa..afe0c7d27b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/AbstractChartFragment.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/AbstractChartFragment.java
@@ -69,6 +69,7 @@
 import nodomain.freeyourgadget.gadgetbridge.model.ActivitySample;
 import nodomain.freeyourgadget.gadgetbridge.util.DateTimeUtils;
 import nodomain.freeyourgadget.gadgetbridge.util.DeviceHelper;
+import nodomain.freeyourgadget.gadgetbridge.util.GBPrefs;
 
 /**
  * A base class fragment to be used with ChartsActivity. The fragment can supply
@@ -460,8 +461,14 @@ protected DefaultChartsData<LineData> refresh(GBDevice gbDevice, List<? extends
 //                    date = cal.getTime();
 //                    dateStringTo = dateFormat.format(date);
 //                }
-
-                float movement = sample.getIntensity();
+                int shownActivityType = GBApplication.getPrefs().getInt(GBPrefs.CHART_VISUAL_DATA, 0);
+                float movement = 0;
+                if (shownActivityType == 1){
+                    movement = sample.getSteps();
+                }
+                else{
+                    movement = sample.getIntensity();
+                }
 
                 float value = movement;
                 switch (type) {
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 c1579891d0..f0b1625fee 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
@@ -90,7 +90,7 @@ private void setupChart() {
         y.setDrawGridLines(false);
 //        y.setDrawLabels(false);
         // TODO: make fixed max value optional
-        y.setAxisMaximum(1f);
+        //y.setAxisMaximum(200f);
         y.setAxisMinimum(0);
         y.setDrawTopYLabelEntry(false);
         y.setTextColor(CHART_TEXT_COLOR);
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/GBPrefs.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/GBPrefs.java
index 1089280dec..39581643dd 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/GBPrefs.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/GBPrefs.java
@@ -42,6 +42,7 @@ public class GBPrefs {
 
     public static final String CHART_MAX_HEART_RATE = "chart_max_heart_rate";
     public static final String CHART_MIN_HEART_RATE = "chart_min_heart_rate";
+    public static final String CHART_VISUAL_DATA = "chart_visual_data";
 
     private final Prefs mPrefs;
 
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index 97d95632ce..a4d1d07a0d 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -429,4 +429,13 @@
         <item>1800</item>
     </string-array>
 
+    <string-array name="chart_visual">
+        <item>@string/activity_prefs_chart_visual_activity</item>
+        <item>@string/activity_prefs_chart_visual_steps</item>
+    </string-array>
+    <string-array name="chart_visual_values">
+        <item>0</item>
+        <item>1</item>
+    </string-array>
+
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a937325808..be723c744e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -487,6 +487,9 @@
     <string name="activity_prefs_charts">Chart settings</string>
     <string name="activity_prefs_chart_max_heart_rate">Max heart rate</string>
     <string name="activity_prefs_chart_min_heart_rate">Min heart rate</string>
+    <string name="activity_prefs_chart_visual_description">Shown activity data on chart</string>
+    <string name="activity_prefs_chart_visual_activity">Activity</string>
+    <string name="activity_prefs_chart_visual_steps">Steps</string>
 
     <string name="authenticating">Authenticating</string>
     <string name="authentication_required">Authentication required</string>
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index 95c8cd731b..28c51e1530 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -153,6 +153,14 @@
                 android:maxLength="3"
                 android:defaultValue="10"
                 android:title="@string/activity_prefs_chart_min_heart_rate" />
+
+            <ListPreference
+                android:defaultValue="0"
+                android:entries="@array/chart_visual"
+                android:entryValues="@array/chart_visual_values"
+                android:key="chart_visual_data"
+                android:title="@string/activity_prefs_chart_visual_description"
+                android:summary="%s" />
         </PreferenceScreen>
         <CheckBoxPreference
             android:layout="@layout/preference_checkbox"