Merge branch 'split_trackdetail#171'

2020-05-25 13:28:36 +02:00
parent b617420290 12e6f03098
commit 490b95a001
22 changed files with 1489 additions and 586 deletions
@@ -32,7 +32,7 @@ import java.util.ArrayList;
 import java.util.List;

 import de.dennisguse.opentracks.R;
-import de.dennisguse.opentracks.TrackDetailActivity;
+import de.dennisguse.opentracks.TrackActivityDataHubInterface;
 import de.dennisguse.opentracks.chart.ChartPoint;
 import de.dennisguse.opentracks.chart.ChartView;
 import de.dennisguse.opentracks.content.TrackDataHub;
@@ -286,7 +286,7 @@ public class ChartFragment extends Fragment implements TrackDataListener {
     * Needs to be synchronized because trackDataHub can be accessed by multiple threads.
     */
    private synchronized void resumeTrackDataHub() {
-        trackDataHub = ((TrackDetailActivity) getActivity()).getTrackDataHub();
+        trackDataHub = ((TrackActivityDataHubInterface) getActivity()).getTrackDataHub();
        trackDataHub.registerTrackDataListener(this, true, true, true, true);
    }

@@ -0,0 +1,310 @@
+/*
+ * Copyright 2008 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+package de.dennisguse.opentracks.fragments;
+
+import android.content.SharedPreferences;
+import android.os.Bundle;
+import android.util.Pair;
+import android.view.KeyEvent;
+import android.view.LayoutInflater;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Spinner;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+
+import de.dennisguse.opentracks.R;
+import de.dennisguse.opentracks.TrackRecordedActivity;
+import de.dennisguse.opentracks.content.TrackDataHub;
+import de.dennisguse.opentracks.content.TrackDataListener;
+import de.dennisguse.opentracks.content.data.Track;
+import de.dennisguse.opentracks.content.data.TrackPoint;
+import de.dennisguse.opentracks.content.data.Waypoint;
+import de.dennisguse.opentracks.stats.TrackStatistics;
+import de.dennisguse.opentracks.util.PreferencesUtils;
+import de.dennisguse.opentracks.util.StringUtils;
+import de.dennisguse.opentracks.util.TrackIconUtils;
+
+/**
+ * A fragment to display track statistics to the user.
+ *
+ * @author Sandor Dornbush
+ * @author Rodrigo Damazio
+ */
+public class StatisticsRecordedFragment extends Fragment implements TrackDataListener {
+
+    private TrackStatistics trackStatistics = null;
+    private String category = "";
+
+    private final SharedPreferences.OnSharedPreferenceChangeListener sharedPreferenceChangeListener = new SharedPreferences.OnSharedPreferenceChangeListener() {
+        @Override
+        public void onSharedPreferenceChanged(SharedPreferences preferences, String key) {
+            if (PreferencesUtils.isKey(getContext(), R.string.stats_units_key, key) || PreferencesUtils.isKey(getContext(), R.string.stats_rate_key, key)) {
+                if (isResumed()) {
+                    getActivity().runOnUiThread(new Runnable() {
+                        @Override
+                        public void run() {
+                            if (isResumed()) {
+                                updateUI();
+                            }
+                        }
+                    });
+                }
+            }
+        }
+    };
+
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        return inflater.inflate(R.layout.statistics_recorded, container, false);
+    }
+
+    /* Views */
+    private TextView totalTimeValueView;
+    private TextView distanceValue;
+    private TextView distanceUnit;
+    private View activityLabel;
+    private Spinner activitySpinner;
+    private TextView movingTimeValue;
+    private TextView speedAvgLabel;
+    private TextView speedAvgValue;
+    private TextView speedAvgUnit;
+    private TextView speedMaxLabel;
+    private TextView speedMaxValue;
+    private TextView speedMaxUnit;
+    private TextView speedMovingLabel;
+    private TextView speedMovingValue;
+    private TextView speedMovingUnit;
+
+    @Override
+    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+
+        totalTimeValueView = view.findViewById(R.id.stats_total_time_value);
+
+        distanceValue = view.findViewById(R.id.stats_distance_value);
+        distanceUnit = view.findViewById(R.id.stats_distance_unit);
+
+        activityLabel = view.findViewById(R.id.stats_activity_type_label);
+        activitySpinner = view.findViewById(R.id.stats_activity_type_icon);
+
+        movingTimeValue = view.findViewById(R.id.stats_moving_time_value);
+
+        speedAvgLabel = view.findViewById(R.id.stats_average_speed_label);
+        speedAvgValue = view.findViewById(R.id.stats_average_speed_value);
+        speedAvgUnit = view.findViewById(R.id.stats_average_speed_unit);
+
+        speedMaxLabel = view.findViewById(R.id.stats_max_speed_label);
+        speedMaxValue = view.findViewById(R.id.stats_max_speed_value);
+        speedMaxUnit = view.findViewById(R.id.stats_max_speed_unit);
+
+        speedMovingLabel = view.findViewById(R.id.stats_moving_speed_label);
+        speedMovingValue = view.findViewById(R.id.stats_moving_speed_value);
+        speedMovingUnit = view.findViewById(R.id.stats_moving_speed_unit);
+    }
+
+    @Override
+    public void onActivityCreated(Bundle savedInstanceState) {
+        super.onActivityCreated(savedInstanceState);
+
+        Spinner activityTypeIcon = getView().findViewById(R.id.stats_activity_type_icon);
+        activityTypeIcon.setAdapter(TrackIconUtils.getIconSpinnerAdapter(getActivity(), ""));
+        activityTypeIcon.setOnTouchListener(new View.OnTouchListener() {
+            @Override
+            public boolean onTouch(View v, MotionEvent event) {
+                if (event.getAction() == MotionEvent.ACTION_UP) {
+                    ((TrackRecordedActivity) getActivity()).chooseActivityType(category);
+                }
+                return true;
+            }
+        });
+        activityTypeIcon.setOnKeyListener(new View.OnKeyListener() {
+            @Override
+            public boolean onKey(View v, int keyCode, KeyEvent event) {
+                if (keyCode == KeyEvent.KEYCODE_DPAD_CENTER) {
+                    ((TrackRecordedActivity) getActivity()).chooseActivityType(category);
+                }
+                return true;
+            }
+        });
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        PreferencesUtils.register(getContext(), sharedPreferenceChangeListener);
+
+        TrackDataHub trackDataHub = ((TrackRecordedActivity) getActivity()).getTrackDataHub();
+        trackDataHub.registerTrackDataListener(this, true, false, true, true);
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        PreferencesUtils.unregister(getContext(), sharedPreferenceChangeListener);
+
+        TrackDataHub trackDataHub = ((TrackRecordedActivity) getActivity()).getTrackDataHub();
+        trackDataHub.unregisterTrackDataListener(this);
+    }
+
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+
+        totalTimeValueView = null;
+
+        distanceValue = null;
+        distanceUnit = null;
+
+        activityLabel = null;
+        activitySpinner = null;
+
+        movingTimeValue = null;
+
+        speedAvgLabel = null;
+        speedAvgValue = null;
+        speedAvgUnit = null;
+
+        speedMaxLabel = null;
+        speedMaxValue = null;
+        speedMaxUnit = null;
+
+        speedMovingLabel = null;
+        speedMovingValue = null;
+        speedMovingUnit = null;
+    }
+
+    @Override
+    public void onTrackUpdated(final Track track) {
+        if (isResumed()) {
+            getActivity().runOnUiThread(new Runnable() {
+                @Override
+                public void run() {
+                    if (isResumed()) {
+                        trackStatistics = track != null ? track.getTrackStatistics() : null;
+                        category = track != null ? track.getCategory() : "";
+                        updateUI();
+                    }
+                }
+            });
+        }
+    }
+
+    @Override
+    public void clearTrackPoints() {
+        // We don't care.
+    }
+
+    @Override
+    public void onSampledInTrackPoint(TrackPoint trackPoint) {
+        // We don't care.
+    }
+
+    @Override
+    public void onSampledOutTrackPoint(TrackPoint trackPoint) {
+        // We don't care.
+    }
+
+    @Override
+    public void onNewTrackPointsDone() {
+        // We don't care.
+    }
+
+    @Override
+    public void clearWaypoints() {
+        // We don't care.
+    }
+
+    @Override
+    public void onNewWaypoint(Waypoint wpt) {
+        // We don't care.
+    }
+
+    @Override
+    public void onNewWaypointsDone() {
+        // We don't care.
+    }
+
+    private void updateUI() {
+        String trackIconValue = TrackIconUtils.getIconValue(getContext(), category);
+
+        boolean metricUnits = PreferencesUtils.isMetricUnits(getContext());
+        boolean reportSpeed = PreferencesUtils.isReportSpeed(getContext(), category);
+
+        // Set total distance
+        {
+            double totalDistance = trackStatistics == null ? Double.NaN : trackStatistics.getTotalDistance();
+            Pair<String, String> parts = StringUtils.getDistanceParts(getContext(), totalDistance, metricUnits);
+
+            distanceValue.setText(parts.first);
+            distanceUnit.setText(parts.second);
+        }
+
+        // Set activity type
+        {
+            activityLabel.setVisibility(trackIconValue != null ? View.VISIBLE : View.GONE);
+
+            activitySpinner.setVisibility(trackIconValue != null ? View.VISIBLE : View.GONE);
+            activitySpinner.setEnabled(false);
+            if (trackIconValue != null) {
+                TrackIconUtils.setIconSpinner(activitySpinner, trackIconValue);
+            }
+        }
+
+        // Set time and start datetime
+        if (trackStatistics != null) {
+            movingTimeValue.setText(StringUtils.formatElapsedTime(trackStatistics.getMovingTime()));
+            totalTimeValueView.setText(StringUtils.formatElapsedTime(trackStatistics.getTotalTime()));
+        }
+
+        // Set average speed/pace
+        {
+            double speed = trackStatistics != null ? trackStatistics.getAverageSpeed() : Double.NaN;
+            speedAvgLabel.setText(reportSpeed ? R.string.stats_average_speed : R.string.stats_average_pace);
+
+            Pair<String, String> parts = StringUtils.getSpeedParts(getContext(), speed, metricUnits, reportSpeed);
+            speedAvgValue.setText(parts.first);
+            speedAvgUnit.setText(parts.second);
+        }
+
+        // Set max speed/pace
+        {
+            double speed = trackStatistics == null ? Double.NaN : trackStatistics.getMaxSpeed();
+
+            speedMaxLabel.setText(reportSpeed ? R.string.stats_max_speed : R.string.stats_fastest_pace);
+
+            Pair<String, String> parts = StringUtils.getSpeedParts(getContext(), speed, metricUnits, reportSpeed);
+            speedMaxValue.setText(parts.first);
+            speedMaxUnit.setText(parts.second);
+        }
+
+        // Set moving speed/pace
+        {
+            double speed = trackStatistics != null ? trackStatistics.getAverageMovingSpeed() : Double.NaN;
+
+            speedMovingLabel.setText(reportSpeed ? R.string.stats_average_moving_speed : R.string.stats_average_moving_pace);
+
+            Pair<String, String> parts = StringUtils.getSpeedParts(getContext(), speed, metricUnits, reportSpeed);
+            speedMovingValue.setText(parts.first);
+            speedMovingUnit.setText(parts.second);
+        }
+    }
+}
@@ -1,19 +1,3 @@
-/*
- * Copyright 2008 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
 package de.dennisguse.opentracks.fragments;

 import android.content.SharedPreferences;
@@ -31,10 +15,11 @@ import android.widget.TextView;

 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.constraintlayout.widget.Group;
 import androidx.fragment.app.Fragment;

 import de.dennisguse.opentracks.R;
-import de.dennisguse.opentracks.TrackDetailActivity;
+import de.dennisguse.opentracks.TrackRecordingActivity;
 import de.dennisguse.opentracks.content.TrackDataHub;
 import de.dennisguse.opentracks.content.TrackDataListener;
 import de.dennisguse.opentracks.content.data.Track;
@@ -59,16 +44,17 @@ import de.dennisguse.opentracks.util.UnitConversions;
 * @author Sandor Dornbush
 * @author Rodrigo Damazio
 */
-public class StatsFragment extends Fragment implements TrackDataListener {
+public class StatisticsRecordingFragment extends Fragment implements TrackDataListener {

-    private static final String TAG = StatsFragment.class.getSimpleName();
+    private static final String TAG = StatisticsRecordingFragment.class.getSimpleName();

    private static final long UI_UPDATE_INTERVAL = UnitConversions.ONE_SECOND_MS;

    private TrackDataHub trackDataHub;
    private Handler handlerUpdateUI;

-    private final TrackRecordingServiceConnection trackRecordingServiceConnection = new TrackRecordingServiceConnection();
+    //TODO Initialize immediately and remove in onDestroy()
+    private TrackRecordingServiceConnection trackRecordingServiceConnection;

    private TrackPoint lastTrackPoint = null;
    private TrackStatistics lastTrackStatistics = null;
@@ -97,6 +83,9 @@ public class StatsFragment extends Fragment implements TrackDataListener {
                if (PreferencesUtils.getRecordingTrackId(getContext()) != PreferencesUtils.RECORDING_TRACK_ID_DEFAULT) {
                    // A recording track id has been set -> Resumes track and starts timer.
                    resumeTrackDataHub();
+                    if (trackRecordingServiceConnection == null) {
+                        trackRecordingServiceConnection = new TrackRecordingServiceConnection(null);
+                    }
                    trackRecordingServiceConnection.startConnection(getContext());

                    handlerUpdateUI.post(updateUIeachSecond);
@@ -107,14 +96,15 @@ public class StatsFragment extends Fragment implements TrackDataListener {

    @Override
    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        return inflater.inflate(R.layout.stats, container, false);
+        return inflater.inflate(R.layout.statistics_recording, container, false);
    }

    /* Views */
-    private View heartRateContainer;
+    private View sensorHorizontalLine;
+    private Group heartRateGroup;
    private TextView heartRateValueView;
    private TextView heartRateSensorView;
-    private View cadenceContainer;
+    private Group cadenceGroup;
    private TextView cadenceValueView;
    private TextView cadenceSensorView;

@@ -145,16 +135,13 @@ public class StatsFragment extends Fragment implements TrackDataListener {
    private TextView speedMovingLabel;
    private TextView speedMovingValue;
    private TextView speedMovingUnit;
-    private View elevationSeparator;
-    private View elevationContainer;
-    private View speedContainer;
+    private Group elevationGroup;
    private TextView speedLabel;
    private TextView speedValue;
    private TextView speedUnit;
    private TextView elevationValue;
    private TextView elevationUnit;
-    private View coordinateSeparator;
-    private View coordinateContainer;
+    private Group coordinateGroup;
    private TextView latitudeValue;
    private TextView longitudeValue;

@@ -162,11 +149,13 @@ public class StatsFragment extends Fragment implements TrackDataListener {
    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
        super.onViewCreated(view, savedInstanceState);

-        heartRateContainer = view.findViewById(R.id.stats_sensor_heart_rate_container);
+        sensorHorizontalLine = view.findViewById(R.id.stats_sensor_horizontal_line);
+
+        heartRateGroup = view.findViewById(R.id.stats_sensor_heart_rate_group);
        heartRateValueView = view.findViewById(R.id.stats_sensor_heart_rate_value);
        heartRateSensorView = view.findViewById(R.id.stats_sensor_heart_rate_sensor_value);

-        cadenceContainer = view.findViewById(R.id.stats_sensor_cadence_container);
+        cadenceGroup = view.findViewById(R.id.stats_sensor_cadence_group);
        cadenceValueView = view.findViewById(R.id.stats_sensor_cadence_value);
        cadenceSensorView = view.findViewById(R.id.stats_sensor_cadence_sensor_value);

@@ -192,10 +181,8 @@ public class StatsFragment extends Fragment implements TrackDataListener {
        speedMovingValue = view.findViewById(R.id.stats_moving_speed_value);
        speedMovingUnit = view.findViewById(R.id.stats_moving_speed_unit);

-        elevationSeparator = view.findViewById(R.id.stats_elevation_separator);
-        elevationContainer = view.findViewById(R.id.stats_elevation_container);
+        elevationGroup = view.findViewById(R.id.stats_elevation_current_group);

-        speedContainer = view.findViewById(R.id.stats_speed);
        speedLabel = view.findViewById(R.id.stats_speed_label);
        speedValue = view.findViewById(R.id.stats_speed_value);
        speedUnit = view.findViewById(R.id.stats_speed_unit);
@@ -203,8 +190,7 @@ public class StatsFragment extends Fragment implements TrackDataListener {
        elevationValue = view.findViewById(R.id.stats_elevation_current_value);
        elevationUnit = view.findViewById(R.id.stats_elevation_current_unit);

-        coordinateSeparator = view.findViewById(R.id.stats_coordinate_separator);
-        coordinateContainer = view.findViewById(R.id.stats_coordinate_container);
+        coordinateGroup = view.findViewById(R.id.stats_coordinate_group);

        latitudeValue = view.findViewById(R.id.stats_latitude_value);
        longitudeValue = view.findViewById(R.id.stats_longitude_value);
@@ -224,7 +210,7 @@ public class StatsFragment extends Fragment implements TrackDataListener {
            @Override
            public boolean onTouch(View v, MotionEvent event) {
                if (event.getAction() == MotionEvent.ACTION_UP) {
-                    ((TrackDetailActivity) getActivity()).chooseActivityType(category);
+                    ((TrackRecordingActivity) getActivity()).chooseActivityType(category);
                }
                return true;
            }
@@ -233,7 +219,7 @@ public class StatsFragment extends Fragment implements TrackDataListener {
            @Override
            public boolean onKey(View v, int keyCode, KeyEvent event) {
                if (keyCode == KeyEvent.KEYCODE_DPAD_CENTER) {
-                    ((TrackDetailActivity) getActivity()).chooseActivityType(category);
+                    ((TrackRecordingActivity) getActivity()).chooseActivityType(category);
                }
                return true;
            }
@@ -246,6 +232,7 @@ public class StatsFragment extends Fragment implements TrackDataListener {
        resumeTrackDataHub();
        PreferencesUtils.register(getContext(), sharedPreferenceChangeListener);

+        trackRecordingServiceConnection = new TrackRecordingServiceConnection(null);
        trackRecordingServiceConnection.startConnection(getContext());

        handlerUpdateUI.post(updateUIeachSecond);
@@ -263,16 +250,21 @@ public class StatsFragment extends Fragment implements TrackDataListener {
    @Override
    public void onStop() {
        super.onStop();
-        trackRecordingServiceConnection.unbind(getContext());
+        if (trackRecordingServiceConnection != null) {
+            trackRecordingServiceConnection.unbind(getContext());
+        }
+        trackRecordingServiceConnection = null;
    }

    @Override
    public void onDestroyView() {
        super.onDestroyView();
-        heartRateContainer = null;
+        sensorHorizontalLine = null;
+
+        heartRateGroup = null;
        heartRateValueView = null;
        heartRateSensorView = null;
-        cadenceContainer = null;
+        cadenceGroup = null;
        cadenceValueView = null;
        cadenceSensorView = null;

@@ -298,10 +290,8 @@ public class StatsFragment extends Fragment implements TrackDataListener {
        speedMovingValue = null;
        speedMovingUnit = null;

-        elevationSeparator = null;
-        elevationContainer = null;
+        elevationGroup = null;

-        speedContainer = null;
        speedLabel = null;
        speedValue = null;
        speedUnit = null;
@@ -309,8 +299,7 @@ public class StatsFragment extends Fragment implements TrackDataListener {
        elevationValue = null;
        elevationUnit = null;

-        coordinateSeparator = null;
-        coordinateContainer = null;
+        coordinateGroup = null;

        latitudeValue = null;
        longitudeValue = null;
@@ -393,7 +382,7 @@ public class StatsFragment extends Fragment implements TrackDataListener {
     * Needs to be synchronized because trackDataHub can be accessed by multiple threads.
     */
    private synchronized void resumeTrackDataHub() {
-        trackDataHub = ((TrackDetailActivity) getActivity()).getTrackDataHub();
+        trackDataHub = ((TrackRecordingActivity) getActivity()).getTrackDataHub();
        trackDataHub.registerTrackDataListener(this, true, false, true, true);
    }

@@ -441,57 +430,65 @@ public class StatsFragment extends Fragment implements TrackDataListener {
            sensorDataSet = trackRecordingService.getSensorData();
        }

-        setHeartRateSensorData(sensorDataSet, isSelectedTrackRecording());
-        setCadenceSensorData(sensorDataSet, isSelectedTrackRecording());
+        setHeartRateSensorData(sensorDataSet);
+        setCadenceSensorData(sensorDataSet);
        setSpeedSensorData(sensorDataSet, isSelectedTrackRecording());
    }

-    private void setHeartRateSensorData(SensorDataSet sensorDataSet, boolean isRecording) {
+    private void setHeartRateSensorData(SensorDataSet sensorDataSet) {
        int isVisible = View.VISIBLE;
-        if (!isRecording || PreferencesUtils.isBluetoothHeartRateSensorAddressNone(getContext())) {
-            isVisible = View.INVISIBLE;
+        if (PreferencesUtils.isBluetoothHeartRateSensorAddressNone(getContext())) {
+            isVisible = View.GONE;
        }
-        heartRateContainer.setVisibility(isVisible);
+        heartRateGroup.setVisibility(isVisible);
+        setVisibilitySensorHorizontalLine();

-        if (isRecording) {
-            String sensorValue = getContext().getString(R.string.value_unknown);
-            String sensorName = getContext().getString(R.string.value_unknown);
-            if (sensorDataSet != null && sensorDataSet.getHeartRate() != null) {
-                SensorDataHeartRate data = sensorDataSet.getHeartRate();
+        String sensorValue = getContext().getString(R.string.value_unknown);
+        String sensorName = getContext().getString(R.string.value_unknown);
+        if (sensorDataSet != null && sensorDataSet.getHeartRate() != null) {
+            SensorDataHeartRate data = sensorDataSet.getHeartRate();

-                sensorName = data.getSensorName();
-                if (data.hasHeartRate_bpm() && data.isRecent()) {
-                    sensorValue = StringUtils.formatDecimal(data.getHeartRate_bpm(), 0);
-                }
+            sensorName = data.getSensorName();
+            if (data.hasHeartRate_bpm() && data.isRecent()) {
+                sensorValue = StringUtils.formatDecimal(data.getHeartRate_bpm(), 0);
            }
-
-            heartRateSensorView.setText(sensorName);
-            heartRateValueView.setText(sensorValue);
        }
+
+        heartRateSensorView.setText(sensorName);
+        heartRateValueView.setText(sensorValue);
    }

-    private void setCadenceSensorData(SensorDataSet sensorDataSet, boolean isRecording) {
+    private void setCadenceSensorData(SensorDataSet sensorDataSet) {
        int isVisible = View.VISIBLE;
-        if (!isRecording || PreferencesUtils.isBluetoothCyclingCadenceSensorAddressNone(getContext())) {
-            isVisible = View.INVISIBLE;
+        if (PreferencesUtils.isBluetoothCyclingCadenceSensorAddressNone(getContext())) {
+            isVisible = View.GONE;
        }
-        cadenceContainer.setVisibility(isVisible);
+        cadenceGroup.setVisibility(isVisible);
+        setVisibilitySensorHorizontalLine();

-        if (isRecording) {
-            String sensorValue = getContext().getString(R.string.value_unknown);
-            String sensorName = getContext().getString(R.string.value_unknown);
-            if (sensorDataSet != null && sensorDataSet.getCyclingCadence() != null) {
-                SensorDataCycling.Cadence data = sensorDataSet.getCyclingCadence();
-                sensorName = data.getSensorName();
+        String sensorValue = getContext().getString(R.string.value_unknown);
+        String sensorName = getContext().getString(R.string.value_unknown);
+        if (sensorDataSet != null && sensorDataSet.getCyclingCadence() != null) {
+            SensorDataCycling.Cadence data = sensorDataSet.getCyclingCadence();
+            sensorName = data.getSensorName();

-                if (data.hasCadence_rpm() && data.isRecent()) {
-                    sensorValue = StringUtils.formatDecimal(data.getCadence_rpm(), 0);
-                }
+            if (data.hasCadence_rpm() && data.isRecent()) {
+                sensorValue = StringUtils.formatDecimal(data.getCadence_rpm(), 0);
            }
-
-            cadenceSensorView.setText(sensorName);
-            cadenceValueView.setText(sensorValue);
        }
+
+        cadenceSensorView.setText(sensorName);
+        cadenceValueView.setText(sensorValue);
+    }
+
+    /**
+     * If cadence and hear rate groups are invisible then sensor horizontal line hast to be invisible too.
+     */
+    private void setVisibilitySensorHorizontalLine() {
+        if (cadenceGroup.getVisibility() != View.VISIBLE && heartRateGroup.getVisibility() != View.VISIBLE) {
+            sensorHorizontalLine.setVisibility(View.GONE);
+        }
+
    }

    private void setSpeedSensorData(SensorDataSet sensorDataSet, boolean isRecording) {
@@ -574,7 +571,7 @@ public class StatsFragment extends Fragment implements TrackDataListener {
        // Make elevation visible?
        {
            boolean showElevation = PreferencesUtils.isShowStatsElevation(getContext());
-            elevationSeparator.setVisibility(showElevation ? View.VISIBLE : View.GONE);
+            elevationGroup.setVisibility(showElevation ? View.VISIBLE : View.GONE);
        }
    }

@@ -603,18 +600,14 @@ public class StatsFragment extends Fragment implements TrackDataListener {

    private void setLocationValues() {
        boolean metricUnits = PreferencesUtils.isMetricUnits(getContext());
-        boolean isRecording = isSelectedTrackRecording();

        // Set speed/pace
-        speedContainer.setVisibility(isRecording ? View.VISIBLE : View.INVISIBLE);
-        if (isRecording) {
-            double speed = lastTrackPoint != null && lastTrackPoint.hasSpeed() ? lastTrackPoint.getSpeed() : Double.NaN;
-            setSpeed(speed);
-        }
+        double speed = lastTrackPoint != null && lastTrackPoint.hasSpeed() ? lastTrackPoint.getSpeed() : Double.NaN;
+        setSpeed(speed);

        // Set elevation
-        boolean showElevation = isRecording && PreferencesUtils.isShowStatsElevation(getContext());
-        elevationContainer.setVisibility(showElevation ? View.VISIBLE : View.GONE);
+        boolean showElevation = PreferencesUtils.isShowStatsElevation(getContext());
+        elevationGroup.setVisibility(showElevation ? View.VISIBLE : View.GONE);

        if (showElevation) {
            double altitude = lastTrackPoint != null && lastTrackPoint.hasAltitude() ? lastTrackPoint.getAltitude() : Double.NaN;
@@ -625,10 +618,9 @@ public class StatsFragment extends Fragment implements TrackDataListener {
        }

        // Set coordinate
-        boolean showCoordinate = isRecording && PreferencesUtils.isStatsShowCoordinate(getContext());
+        boolean showCoordinate = PreferencesUtils.isStatsShowCoordinate(getContext());

-        coordinateSeparator.setVisibility(showCoordinate ? View.VISIBLE : View.GONE);
-        coordinateContainer.setVisibility(showCoordinate ? View.VISIBLE : View.GONE);
+        coordinateGroup.setVisibility(showCoordinate ? View.VISIBLE : View.GONE);
        if (showCoordinate) {
            double latitude = lastTrackPoint != null ? lastTrackPoint.getLatitude() : Double.NaN;
            String latitudeText = Double.isNaN(latitude) || Double.isInfinite(latitude) ? getContext().getString(R.string.value_unknown) : StringUtils.formatCoordinate(latitude);