Merge branch 'group_11' of https://github.com/rilling/OpenTracksConco…

…rdia into group_11

src/main/java/de/dennisguse/opentracks/settings/AggregatedStatsSettingsFragment.java

@@ -0,0 +1,23 @@
+package de.dennisguse.opentracks.settings;
+
+import android.os.Bundle;
+
+import androidx.preference.PreferenceFragmentCompat;
+
+import de.dennisguse.opentracks.BuildConfig;
+import de.dennisguse.opentracks.R;
+
+public class AggregatedStatsSettingsFragment extends PreferenceFragmentCompat {
+
+    @Override
+    public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
+        addPreferencesFromResource(R.xml.settings_aggregated_stats);
+    }
+
+    @Override
+    public void onStart() {
+        super.onStart();
+        ((SettingsActivity) getActivity()).getSupportActionBar().setTitle(R.string.settings_aggregated_stats);
+        findPreference(getString(R.string.settings_aggregated_stats_key));
+    }
+}

src/main/java/de/dennisguse/opentracks/settings/MainSettingsFragment.java

@@ -49,6 +49,11 @@ public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
             ((SettingsActivity) getActivity()).openScreen(getString(R.string.settings_api_key));
             return true;
         });
+
+        findPreference(getString(R.string.settings_aggregated_stats_key)).setOnPreferenceClickListener(preference -> {
+            ((SettingsActivity) getActivity()).openScreen(getString(R.string.settings_aggregated_stats_key));
+            return true;
+        });
     }
 
     @Override

src/main/java/de/dennisguse/opentracks/settings/PreferencesUtils.java

@@ -451,6 +451,15 @@ public static void setVoiceAnnounceAverageHeartRate(boolean value) {
         setBoolean(R.string.voice_announce_average_heart_rate_key, value);
     }
 
+    public static boolean shouldElevationGain() {
+        return getBoolean(R.string.aggregated_stats_package_key, false);
+    }
+
+    @VisibleForTesting
+    public static void setElevationGain(boolean value) {
+        setBoolean(R.string.aggregated_stats_package_key, value);
+    }
+
     public static Distance getRecordingDistanceInterval() {
         return Distance.of(getInt(R.string.recording_distance_interval_key, getRecordingDistanceIntervalDefaultInternal()));
     }

src/main/java/de/dennisguse/opentracks/settings/SettingsActivity.java

@@ -94,6 +94,8 @@ private PreferenceFragmentCompat getPreferenceScreen(String key) {
             fragment = new ImportExportSettingsFragment();
         } else if (key.equals(getString(R.string.settings_api_key))) {
             fragment = new PublicAPISettingsFragment();
+        } else if (key.equals(getString(R.string.settings_aggregated_stats_key))) {
+            fragment = new AggregatedStatsSettingsFragment();
         }
 
         return fragment;

src/main/java/de/dennisguse/opentracks/ui/aggregatedStatistics/AggregatedStatisticsAdapter.java

@@ -22,6 +22,7 @@
 import de.dennisguse.opentracks.settings.UnitSystem;
 import de.dennisguse.opentracks.stats.TrackStatistics;
 import de.dennisguse.opentracks.util.StringUtils;
+import static de.dennisguse.opentracks.settings.PreferencesUtils.shouldElevationGain;
 
 public class AggregatedStatisticsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
 
@@ -49,9 +50,9 @@ public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int positi
         String type = aggregatedStatistic.getActivityTypeLocalized();
         if (ActivityType.findByLocalizedString(context, type).isShowSpeedPreferred()) {
             viewHolder.setSpeed(aggregatedStatistic);
-            viewHolder.setElevation(aggregatedStatistic);
-
-
+            if(shouldElevationGain()) {
+                viewHolder.setElevation(aggregatedStatistic);
+            }
         } else {
             viewHolder.setPace(aggregatedStatistic);
         }
@@ -93,9 +94,9 @@ private class ViewHolder extends RecyclerView.ViewHolder {
         private final TextView maxSpeedUnit;
         private final TextView maxSpeedLabel;
 
-        private final TextView elevationGain;
-        private final TextView elevationLabel;
-        private final TextView elevationUnit;
+        private TextView elevationGain = null;
+        private TextView elevationLabel = null;
+        private TextView elevationUnit = null;
 
         private UnitSystem unitSystem = UnitSystem.defaultUnitSystem();
         private boolean reportSpeed;
@@ -114,13 +115,14 @@ public ViewHolder(View view) {
             maxSpeed = view.findViewById(R.id.aggregated_stats_max_rate);
             maxSpeedUnit = view.findViewById(R.id.aggregated_stats_max_rate_unit);
             maxSpeedLabel = view.findViewById(R.id.aggregated_stats_max_rate_label);
-            elevationGain = view.findViewById(R.id.aggregated_stats_elevation_gain);
-            elevationLabel = view.findViewById(R.id.aggregated_stats_elevation_gain_label);
-            elevationUnit = view.findViewById(R.id.aggregated_stats_elevation_gain_unit);
-
-            elevationLabel.setText("Elevation Gain");
-            elevationUnit.setText("ft");
+            if(shouldElevationGain()) {
+                elevationGain = view.findViewById(R.id.aggregated_stats_elevation_gain);
+                elevationLabel = view.findViewById(R.id.aggregated_stats_elevation_gain_label);
+                elevationUnit = view.findViewById(R.id.aggregated_stats_elevation_gain_unit);
 
+                elevationLabel.setText("Elevation Gain");
+                elevationUnit.setText("ft");
+            }
         }
         public void setElevation(AggregatedStatistics.AggregatedStatistic aggregatedStatistic) {
             if(aggregatedStatistic.getTrackStatistics().getTotalAltitudeGain()==null)

src/main/res/values/settings.xml

@@ -23,6 +23,8 @@
 
     <string name="settings_import_export_key" translatable="false">settingsImportExport</string>
 
+    <string name="settings_aggregated_stats_key" translatable="false">settingsAggregatedStats</string>
+
     <!-- Setting's categories -->
 
     <string name="settings_reset_key" translatable="false">settingsReset</string>
@@ -286,6 +288,8 @@
     <string name="settings_api_key" translatable="false">settingsAPI</string>
     <string name="publicapi_package_key" translatable="false">apiPackageKey</string>
     <string name="publicapi_enabled_key" translatable="false">apiEnabledKey</string>
+    <string name="aggregated_stats_package_key" translatable="false">AggregatedStatsPackageKey</string>
+    <bool name="aggregated_stats_enabled_default">false</bool>
     <bool name="publicapi_enabled_default">false</bool>
     <string name="publicapi_dashboard_enabled_key" translatable="false">apiDashboardEnabledKey</string>
     <bool name="publicapi_dashboard_enabled_default">false</bool>

src/main/res/values/strings.xml

@@ -449,6 +449,11 @@ limitations under the License.
     <string name="settings_stats_units_nautical">Nautical (NM, ft)</string>
     <string name="settings_stats_units_title">Preferred units</string>
 
+    <!-- Settings Aggregated stats -->
+    <string name="settings_aggregated_stats">Aggregated Stats</string>
+    <string name="settings_aggregated_stats_summary">Choose your own stats</string>
+    <string name="settings_elevation_gain">Elevation Gain</string>
+
     <!-- Settings public api -->
     <string name="settings_api_title">Public API</string>
     <string name="settings_api_summary">Remote control and statistics API for other apps</string>

src/main/res/xml/settings.xml

@@ -56,6 +56,12 @@
         android:summary="@string/settings_api_summary"
         android:title="@string/settings_api_title" />
 
+    <Preference
+        android:icon="@drawable/ic_statistics_24dp"
+        android:key="@string/settings_aggregated_stats_key"
+        android:summary="@string/settings_aggregated_stats_summary"
+        android:title="@string/settings_aggregated_stats" />
+
     <Preference
         android:icon="@drawable/ic_baseline_info_24"
         android:summary="@string/settings_open_tracks_summary"

src/main/res/xml/settings_aggregated_stats.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+android:title="@string/settings_aggregated_stats">
+
+<Preference
+    android:key="@string/aggregated_stats_package_key"
+    android:selectable="false"
+    android:persistent="false"
+    android:title="@string/settings_aggregated_stats" />
+
+
+<SwitchPreference
+    android:defaultValue="false"
+    android:key="@string/aggregated_stats_package_key"
+    android:title="@string/settings_elevation_gain" />
+
+<!--<SwitchPreferenceCompat-->
+<!--    android:title="@string/settings_public_api_dashboard_enabled_title"-->
+<!--    android:summaryOn="@string/settings_public_api_dashboard_enabled_summary_on"-->
+<!--    android:summaryOff="@string/settings_public_api_dashboard_enabled_summary_off"-->
+<!--    android:defaultValue="@bool/publicapi_dashboard_enabled_default"-->
+<!--    android:key="@string/publicapi_dashboard_enabled_key" />-->
+
+</PreferenceScreen>