Release: v4.2.2

Bumps [com.android.tools:desugar_jdk_libs](https://github.com/google/desugar_jdk_libs) from 2.0.0 to 2.0.1.
- [Release notes](https://github.com/google/desugar_jdk_libs/releases)
- [Changelog](https://github.com/google/desugar_jdk_libs/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/desugar_jdk_libs/commits)

---
updated-dependencies:
- dependency-name: com.android.tools:desugar_jdk_libs
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

README_RELEASE.md

@@ -17,7 +17,7 @@ Application id: de.dennisguse.opentracks
 It if it properly tagged F-Droid takes care of building the app and publishing.
 Usually, it takes two days before the update is published (build, signed, and published). 
 
-The recent build activity can be found [here](https://f-droid.org/wiki/index.php?title=Special:RecentChanges&days=7&from=&hidebots=0&hideanons=1&hideliu=1&limit=500)
+The recent build activity can be found [here](https://monitor.f-droid.org/builds/build)
 
 ## Google Play Store
 Application id: `de.dennisguse.opentracks.playstore`

build.gradle

@@ -6,7 +6,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.0'
+        classpath 'com.android.tools.build:gradle:7.4.1'
     }
 }
 
@@ -59,8 +59,8 @@ android {
 
     defaultConfig {
         applicationId "de.dennisguse.opentracks"
-        versionCode 5132
-        versionName "v4.2.1"
+        versionCode 5141
+        versionName "v4.2.2"
 
         buildConfigField "String", "VERSION_NAME_FULL", "\"${getVersionName()}\""
 
@@ -120,13 +120,13 @@ android {
 }
 
 dependencies {
-    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.0'
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.1'
 
     implementation 'androidx.appcompat:appcompat:1.6.0'
     implementation 'androidx.preference:preference:1.2.0'
     implementation 'androidx.documentfile:documentfile:1.0.1'
     implementation 'androidx.gridlayout:gridlayout:1.0.0'
-    implementation 'com.google.android.material:material:1.7.0'
+    implementation 'com.google.android.material:material:1.8.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation 'androidx.core:core-splashscreen:1.0.0'
 

fastlane/metadata/android/en-US/changelogs/5141.txt

@@ -0,0 +1,9 @@
+v4.2.2: OpenTracks
+
+Bugfix:
+- Track icon wrongly shown in dialog
+- Textcolor for heartrate zone 1 was ignoring theme
+- Not all activityTypes were shown in dropdownlist
+- Crash due to color not found
+
+

src/main/java/de/dennisguse/opentracks/TrackEditActivity.java

@@ -24,6 +24,7 @@ import android.widget.ArrayAdapter;
 import androidx.annotation.NonNull;
 
 import de.dennisguse.opentracks.data.ContentProviderUtils;
+import de.dennisguse.opentracks.data.models.ActivityType;
 import de.dennisguse.opentracks.data.models.Track;
 import de.dennisguse.opentracks.databinding.TrackEditBinding;
 import de.dennisguse.opentracks.fragments.ChooseActivityTypeDialogFragment;
@@ -75,7 +76,7 @@ public class TrackEditActivity extends AbstractActivity implements ChooseActivit
 
         viewBinding.fields.trackEditActivityType.setText(track.getCategory());
 
-        ArrayAdapter<CharSequence> adapter = ArrayAdapter.createFromResource(this, R.array.activity_types, android.R.layout.simple_dropdown_item_1line);
+        ArrayAdapter<String> adapter = new ArrayAdapter<>(this, android.R.layout.simple_dropdown_item_1line, ActivityType.getLocalizedStrings(this));
         viewBinding.fields.trackEditActivityType.setAdapter(adapter);
         viewBinding.fields.trackEditActivityType.setOnItemClickListener((parent, view, position, id) -> setActivityTypeIcon(TrackIconUtils.getIconValue(this, (String) viewBinding.fields.trackEditActivityType.getAdapter().getItem(position))));
         viewBinding.fields.trackEditActivityType.setOnFocusChangeListener((v, hasFocus) -> {

src/main/java/de/dennisguse/opentracks/TrackStoppedActivity.java

@@ -8,6 +8,7 @@ import android.view.View;
 import android.widget.ArrayAdapter;
 
 import de.dennisguse.opentracks.data.ContentProviderUtils;
+import de.dennisguse.opentracks.data.models.ActivityType;
 import de.dennisguse.opentracks.data.models.DistanceFormatter;
 import de.dennisguse.opentracks.data.models.SpeedFormatter;
 import de.dennisguse.opentracks.data.models.Track;
@@ -51,7 +52,7 @@ public class TrackStoppedActivity extends AbstractTrackDeleteActivity implements
 
         viewBinding.trackEditActivityType.setText(track.getCategory());
 
-        ArrayAdapter<CharSequence> adapter = ArrayAdapter.createFromResource(this, R.array.activity_types, android.R.layout.simple_dropdown_item_1line);
+        ArrayAdapter<String> adapter = new ArrayAdapter<>(this, android.R.layout.simple_dropdown_item_1line, ActivityType.getLocalizedStrings(this));
         viewBinding.trackEditActivityType.setAdapter(adapter);
         viewBinding.trackEditActivityType.setOnItemClickListener((parent, view, position, id) -> setActivityTypeIcon(TrackIconUtils.getIconValue(this, (String) viewBinding.trackEditActivityType.getAdapter().getItem(position))));
         viewBinding.trackEditActivityType.setOnFocusChangeListener((v, hasFocus) -> {

src/main/java/de/dennisguse/opentracks/data/models/ActivityType.java

@@ -0,0 +1,79 @@
+package de.dennisguse.opentracks.data.models;
+
+import android.content.Context;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import de.dennisguse.opentracks.R;
+
+public enum ActivityType {
+    AIRPLANE("AIRPLANE", R.drawable.ic_activity_flight_24dp, true, R.string.activity_type_airplane, R.string.activity_type_commercial_airplane, R.string.activity_type_rc_airplane),
+    BIKE("BIKE", R.drawable.ic_activity_bike_24dp, true, R.string.activity_type_biking, R.string.activity_type_cycling, R.string.activity_type_dirt_bike, R.string.activity_type_road_biking, R.string.activity_type_track_cycling),
+    MOUNTAIN_BIKE("MOUNTAIN_BIKE", R.drawable.ic_activity_mtb_24dp, true, R.string.activity_type_mountain_biking),
+    MOTOR_BIKE("MOTOR_BIKE", R.drawable.ic_activity_motorbike_24dp, true, R.string.activity_type_motor_bike),
+    KAYAK("KAYAK", R.drawable.ic_activity_kayaking_24dp, true, R.string.activity_type_kayaking),
+    BOAT("BOAT", R.drawable.ic_activity_boat_24dp, true, R.string.activity_type_boat, R.string.activity_type_ferry, R.string.activity_type_motor_boating, R.string.activity_type_rc_boat),
+    SAILING("SAILING", R.drawable.ic_activity_sailing_24dp, true, R.string.activity_type_sailing),
+    DRIVE("DRIVE", R.drawable.ic_activity_drive_24dp, true, R.string.activity_type_atv, R.string.activity_type_driving, R.string.activity_type_driving_bus, R.string.activity_type_driving_car),
+    RUN("RUN", R.drawable.ic_activity_run_24dp, false, R.string.activity_type_running, R.string.activity_type_street_running, R.string.activity_type_track_running, R.string.activity_type_trail_running),
+    SKI("SKI", R.drawable.ic_activity_skiing_24dp, true, R.string.activity_type_cross_country_skiing, R.string.activity_type_skiing),
+    SNOW_BOARDING("SNOW_BOARDING", R.drawable.ic_activity_snowboarding_24dp, true, R.string.activity_type_snow_boarding),
+    UNKNOWN("UNKNOWN", R.drawable.ic_logo_24dp, true, R.string.activity_type_unknown),
+    WALK("WALK", R.drawable.ic_activity_walk_24dp, false, R.string.activity_type_hiking, R.string.activity_type_off_trail_hiking, R.string.activity_type_speed_walking, R.string.activity_type_trail_hiking, R.string.activity_type_walking),
+    ESCOOTER("ESCOOTER", R.drawable.ic_activity_escooter_24dp, true, R.string.activity_type_escooter),
+    INLINE_SKATING("INLINES_SKATING", R.drawable.ic_activity_inline_skating_24dp, true, R.string.activity_type_inline_skating),
+    SKATE_BOARDING("SKATE_BOARDING", R.drawable.ic_activity_skateboarding_24dp, true, R.string.activity_type_skate_boarding),
+    CLIMBING("CLIMBING", R.drawable.ic_activity_climbing_24dp, false, R.string.activity_type_climbing),
+    SWIMMING("SWIMMING", R.drawable.ic_activity_swimming_24dp, false, R.string.activity_type_swimming),
+    SWIMMING_OPEN("SWIMMING_OPEN", R.drawable.ic_activity_swimming_open_24dp, false, R.string.activity_type_swimming_open),
+    WORKOUT("WORKOUT", R.drawable.ic_activity_workout_24dp, false, R.string.activity_type_workout);
+
+    final String id;
+    final int iconId;
+    final boolean showSpeedPreferred;
+    final int[] localizedStringIds;
+
+    //isSpeed?
+
+    ActivityType(String id, int iconId, boolean showSpeedPreferred, int... localizedStringIds) {
+        this.id = id;
+        this.iconId = iconId;
+        this.showSpeedPreferred = showSpeedPreferred;
+        this.localizedStringIds = localizedStringIds;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public int getIconId() {
+        return iconId;
+    }
+
+    public boolean isShowSpeedPreferred() {
+        return showSpeedPreferred;
+    }
+
+    public int[] getLocalizedStringIds() {
+        return localizedStringIds;
+    }
+
+    public int getFirstLocalizedStringId() {
+        return localizedStringIds[0];
+    }
+
+    public static List<String> getLocalizedStrings(Context context) {
+        List<String> result = new ArrayList<>();
+        for (ActivityType activityType : values()) {
+            List<String> strings = Arrays.stream(activityType.localizedStringIds)
+                    .mapToObj(context::getString)
+                    .collect(Collectors.toList());
+            result.addAll(strings);
+        }
+
+        return result;
+    }
+}

src/main/java/de/dennisguse/opentracks/data/models/HeartRateZones.java

@@ -1,8 +1,12 @@
 package de.dennisguse.opentracks.data.models;
 
+import android.content.Context;
+
 import androidx.annotation.NonNull;
+import androidx.core.content.ContextCompat;
 
 import de.dennisguse.opentracks.R;
+import de.dennisguse.opentracks.ui.util.ThemeUtils;
 
 public class HeartRateZones {
 
@@ -12,22 +16,23 @@ public class HeartRateZones {
         this.max = max;
     }
 
-    public int getColorForZone(HeartRate current) {
+    public int getTextColorForZone(Context context, HeartRate current) {
         if (current != null) {
             if (current.getBPM() >= max.getBPM() * 0.9) {
-                return R.color.heart_rate_zone_textcolor_5;
+                return ContextCompat.getColor(context, R.color.heart_rate_zone_textcolor_5);
             }
             if (current.getBPM() >= max.getBPM() * 0.8) {
-                return R.color.heart_rate_zone_textcolor_4;
+                return ContextCompat.getColor(context, R.color.heart_rate_zone_textcolor_4);
             }
             if (current.getBPM() >= max.getBPM() * 0.7) {
-                return R.color.heart_rate_zone_textcolor_3;
+                return ContextCompat.getColor(context, R.color.heart_rate_zone_textcolor_3);
             }
             if (current.getBPM() >= max.getBPM() * 0.6) {
-                return R.color.heart_rate_zone_textcolor_2;
+                return ContextCompat.getColor(context, R.color.heart_rate_zone_textcolor_2);
             }
         }
 
-        return R.color.heart_rate_zone_textcolor_1;
+        // Zone 1
+        return ThemeUtils.getTextColorPrimary(context);
     }
 }

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

@@ -28,6 +28,7 @@ import androidx.preference.DialogPreference;
 import androidx.preference.PreferenceDialogFragmentCompat;
 
 import de.dennisguse.opentracks.R;
+import de.dennisguse.opentracks.data.models.ActivityType;
 import de.dennisguse.opentracks.fragments.ChooseActivityTypeDialogFragment;
 import de.dennisguse.opentracks.util.TrackIconUtils;
 
@@ -79,7 +80,7 @@ public class ActivityTypePreference extends DialogPreference {
             textView = view.findViewById(R.id.activity_type_preference_text_view);
             String category = PreferencesUtils.getDefaultActivity();
             textView.setText(category);
-            ArrayAdapter<CharSequence> adapter = ArrayAdapter.createFromResource(context, R.array.activity_types, android.R.layout.simple_dropdown_item_1line);
+            ArrayAdapter<String> adapter = new ArrayAdapter<>(context, android.R.layout.simple_dropdown_item_1line, ActivityType.getLocalizedStrings(context));
             textView.setAdapter(adapter);
             textView.setOnItemClickListener((parent, v, position, id) -> {
                 String iconValue = TrackIconUtils.getIconValue(context, (String) textView.getAdapter().getItem(position));

src/main/java/de/dennisguse/opentracks/util/TrackIconUtils.java

@@ -18,15 +18,15 @@ package de.dennisguse.opentracks.util;
 
 import android.content.Context;
 import android.content.res.Resources;
-import android.util.Pair;
 
 import androidx.annotation.NonNull;
 
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
+import java.util.Arrays;
 import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
 
-import de.dennisguse.opentracks.R;
+import de.dennisguse.opentracks.data.models.ActivityType;
 
 /**
  * Utilities for track icon.
@@ -35,219 +35,71 @@ import de.dennisguse.opentracks.R;
  */
 public class TrackIconUtils {
 
-    private static final String AIRPLANE = "AIRPLANE";
-    private static final String BIKE = "BIKE";
-    private static final String MOUNTAIN_BIKE = "MOUNTAIN_BIKE";
-    private static final String MOTOR_BIKE = "MOTOR_BIKE";
-    private static final String KAYAK = "KAYAK";
-    private static final String BOAT = "BOAT";
-    private static final String SAILING = "SAILING";
-    private static final String DRIVE = "DRIVE";
-    private static final String RUN = "RUN";
-    private static final String SKI = "SKI";
-    private static final String SNOW_BOARDING = "SNOW_BOARDING";
-    private static final String UNKNOWN = "UNKNOWN";
-    private static final String WALK = "WALK";
-    private static final String ESCOOTER = "ESCOOTER";
-    private static final String INLINE_SKATING = "INLINES_SKATING";
-    private static final String SKATE_BOARDING = "SKATE_BOARDING";
-    private static final String CLIMBING = "CLIMBING";
-    private static final String SWIMMING = "SWIMMING";
-    private static final String SWIMMING_OPEN = "SWIMMING_OPEN";
-    private static final String WORKOUT = "WORKOUT";
+    public static int getIconDrawable(String activityTypeId) {
+        Optional<ActivityType> found = Arrays.stream(ActivityType.values()).filter(
+                it -> it.getId().equals(activityTypeId)
+        ).findFirst();
 
-    private static final int ACTIVITY_UNKNOWN_LOGO = R.drawable.ic_logo_24dp;
-
-    private static final int[] AIRPLANE_LIST = new int[]{R.string.activity_type_airplane, R.string.activity_type_commercial_airplane, R.string.activity_type_rc_airplane};
-    private static final int[] BIKE_LIST = new int[]{R.string.activity_type_biking, R.string.activity_type_cycling, R.string.activity_type_dirt_bike, R.string.activity_type_road_biking, R.string.activity_type_track_cycling};
-    private static final int[] BOAT_LIST = new int[]{R.string.activity_type_boat, R.string.activity_type_ferry, R.string.activity_type_motor_boating, R.string.activity_type_rc_boat};
-    private static final int[] CLIMBING_LIST = new int[]{R.string.activity_type_climbing};
-    private static final int[] DRIVE_LIST = new int[]{R.string.activity_type_atv, R.string.activity_type_driving, R.string.activity_type_driving_bus, R.string.activity_type_driving_car};
-    private static final int[] MOTOR_BIKE_LIST = new int[]{R.string.activity_type_motor_bike};
-    private static final int[] MOUNTAIN_BIKE_LIST = new int[]{R.string.activity_type_mountain_biking};
-    private static final int[] ESCOOTER_LIST = new int[]{R.string.activity_type_escooter};
-    private static final int[] INLINE_SKATING_LIST = new int[]{R.string.activity_type_inline_skating};
-    private static final int[] RUN_LIST = new int[]{R.string.activity_type_running, R.string.activity_type_street_running, R.string.activity_type_track_running, R.string.activity_type_trail_running};
-    private static final int[] SAILING_LIST = new int[]{R.string.activity_type_sailing};
-    private static final int[] SKI_LIST = new int[]{R.string.activity_type_cross_country_skiing, R.string.activity_type_skiing};
-    private static final int[] SNOW_BOARDING_LIST = new int[]{R.string.activity_type_snow_boarding};
-    private static final int[] SKATE_BOARDING_LIST = new int[]{R.string.activity_type_skate_boarding};
-    private static final int[] KAYAKING_LIST = new int[]{R.string.activity_type_kayaking};
-    private static final int[] WALK_LIST = new int[]{R.string.activity_type_hiking, R.string.activity_type_off_trail_hiking, R.string.activity_type_speed_walking, R.string.activity_type_trail_hiking, R.string.activity_type_walking};
-    private static final int[] SWIM_LIST = new int[]{R.string.activity_type_swimming, R.string.activity_type_swimming_open};
-    private static final int[] WORKOUT_LIST = new int[]{R.string.activity_type_workout};
-
-    // List of icons whose sports associated use speed (in km/h or mi/h).
-    private static final int[] SPEED_ICON = {
-            // Unknown.
-            R.string.activity_type_unknown,
-            // All airplane categories.
-            R.string.activity_type_airplane, R.string.activity_type_commercial_airplane, R.string.activity_type_rc_airplane,
-            // All bike categories.
-            R.string.activity_type_biking, R.string.activity_type_cycling, R.string.activity_type_dirt_bike, R.string.activity_type_motor_bike, R.string.activity_type_mountain_biking, R.string.activity_type_road_biking, R.string.activity_type_track_cycling, R.string.activity_type_inline_skating,
-            // All boat categories.
-            R.string.activity_type_boat, R.string.activity_type_ferry, R.string.activity_type_motor_boating, R.string.activity_type_rc_boat, R.string.activity_type_sailing, R.string.activity_type_kayaking,
-            // All drive categories.
-            R.string.activity_type_atv, R.string.activity_type_driving, R.string.activity_type_driving_bus, R.string.activity_type_driving_car, R.string.activity_type_escooter, R.string.activity_type_skate_boarding,
-            // All wintersport categories
-            R.string.activity_type_skiing, R.string.activity_type_snow_boarding
-
-    };
-
-    //TODO Use Map.of()
-    private static final LinkedHashMap<String, Pair<Integer, Integer>> MAP = new LinkedHashMap<>();
-
-    static {
-        //Reflects order in ChooseActivityTypeDialogFragmentActivity
-        MAP.put(UNKNOWN, new Pair<>(R.string.activity_type_unknown, ACTIVITY_UNKNOWN_LOGO));
-        MAP.put(RUN, new Pair<>(R.string.activity_type_running, R.drawable.ic_activity_run_24dp));
-        MAP.put(WALK, new Pair<>(R.string.activity_type_walking, R.drawable.ic_activity_walk_24dp));
-        MAP.put(CLIMBING, new Pair<>(R.string.activity_type_climbing, R.drawable.ic_activity_climbing_24dp));
-        MAP.put(SKATE_BOARDING, new Pair<>(R.string.activity_type_skate_boarding, R.drawable.ic_activity_skateboarding_24dp));
-        MAP.put(INLINE_SKATING, new Pair<>(R.string.activity_type_inline_skating, R.drawable.ic_activity_inline_skating_24dp));
-        MAP.put(SNOW_BOARDING, new Pair<>(R.string.activity_type_snow_boarding, R.drawable.ic_activity_snowboarding_24dp));
-        MAP.put(SKI, new Pair<>(R.string.activity_type_skiing, R.drawable.ic_activity_skiing_24dp));
-        MAP.put(ESCOOTER, new Pair<>(R.string.activity_type_escooter, R.drawable.ic_activity_escooter_24dp));
-        MAP.put(BIKE, new Pair<>(R.string.activity_type_biking, R.drawable.ic_activity_bike_24dp));
-        MAP.put(MOUNTAIN_BIKE, new Pair<>(R.string.activity_type_mountain_biking, R.drawable.ic_activity_mtb_24dp));
-        MAP.put(MOTOR_BIKE, new Pair<>(R.string.activity_type_motor_bike, R.drawable.ic_activity_motorbike_24dp));
-        MAP.put(DRIVE, new Pair<>(R.string.activity_type_driving, R.drawable.ic_activity_drive_24dp));
-        MAP.put(AIRPLANE, new Pair<>(R.string.activity_type_airplane, R.drawable.ic_activity_flight_24dp));
-        MAP.put(KAYAK, new Pair<>(R.string.activity_type_kayaking, R.drawable.ic_activity_kayaking_24dp));
-        MAP.put(BOAT, new Pair<>(R.string.activity_type_boat, R.drawable.ic_activity_boat_24dp));
-        MAP.put(SAILING, new Pair<>(R.string.activity_type_sailing, R.drawable.ic_activity_sailing_24dp));
-        MAP.put(SWIMMING, new Pair<>(R.string.activity_type_swimming, R.drawable.ic_activity_swimming_24dp));
-        MAP.put(SWIMMING_OPEN, new Pair<>(R.string.activity_type_swimming_open, R.drawable.ic_activity_swimming_open_24dp));
-        MAP.put(WORKOUT, new Pair<>(R.string.activity_type_workout, R.drawable.ic_activity_workout_24dp));
-    }
-
-    private TrackIconUtils() {
-    }
-
-    /**
-     * Gets the icon drawable.
-     *
-     * @param iconValue the icon value
-     */
-    public static int getIconDrawable(String iconValue) {
-        if (iconValue == null || iconValue.equals("")) {
-            return ACTIVITY_UNKNOWN_LOGO;
+        if (found.isEmpty()) {
+            return ActivityType.UNKNOWN.getIconId();
         }
-        Pair<Integer, Integer> pair = MAP.get(iconValue);
-        return pair == null ? ACTIVITY_UNKNOWN_LOGO : pair.second;
+
+        return found.get().getIconId();
     }
 
-    /**
-     * Gets the icon activity type.
-     *
-     * @param iconValue the icon value
-     */
-    public static int getIconActivityType(String iconValue) {
-        if (iconValue == null || iconValue.equals("")) {
-            return R.string.activity_type_unknown;
+    public static int getIconActivityType(String activityTypeId) {
+        Optional<ActivityType> found = Arrays.stream(ActivityType.values()).filter(
+                it -> it.getId().equals(activityTypeId)
+        ).findFirst();
+
+        if (found.isEmpty()) {
+            return ActivityType.UNKNOWN.getFirstLocalizedStringId();
         }
-        Pair<Integer, Integer> pair = MAP.get(iconValue);
-        return pair == null ? R.string.activity_type_unknown : pair.first;
+
+        return found.get().getFirstLocalizedStringId();
     }
 
     /**
      * Gets all icon values.
      */
     public static List<String> getAllIconValues() {
-        return new ArrayList<>(MAP.keySet());
+        return Arrays.stream(ActivityType.values())
+                .map(ActivityType::getId)
+                .collect(Collectors.toList());
     }
 
     /**
      * Gets the icon value.
      *
-     * @param context      the context
-     * @param activityType the activity type
+     * @param context        the context
+     * @param activityTypeId the activity type
      */
     @NonNull
-    public static String getIconValue(Context context, String activityType) {
-        Resources resources = context.getResources();
-        if (activityType == null || activityType.equals("")) {
-            return UNKNOWN;
+    public static String getIconValue(Context context, String activityTypeId) {
+        Optional<ActivityType> selected = Arrays.stream(ActivityType.values())
+                .filter(
+                        it -> Arrays.stream(it.getLocalizedStringIds())
+                                .anyMatch(id -> context.getString(id).equals(activityTypeId))
+                )
+                .findFirst();
+        if (selected.isEmpty()) {
+            return ActivityType.UNKNOWN.getId();
         }
-        if (inList(resources, activityType, AIRPLANE_LIST)) {
-            return AIRPLANE;
-        }
-        if (inList(resources, activityType, BIKE_LIST)) {
-            return BIKE;
-        }
-        if (inList(resources, activityType, MOUNTAIN_BIKE_LIST)) {
-            return MOUNTAIN_BIKE;
-        }
-        if (inList(resources, activityType, CLIMBING_LIST)) {
-            return CLIMBING;
-        }
-        if (inList(resources, activityType, MOTOR_BIKE_LIST)) {
-            return MOTOR_BIKE;
-        }
-        if (inList(resources, activityType, KAYAKING_LIST)) {
-            return KAYAK;
-        }
-        if (inList(resources, activityType, BOAT_LIST)) {
-            return BOAT;
-        }
-        if (inList(resources, activityType, SAILING_LIST)) {
-            return SAILING;
-        }
-        if (inList(resources, activityType, DRIVE_LIST)) {
-            return DRIVE;
-        }
-        if (inList(resources, activityType, INLINE_SKATING_LIST)) {
-            return INLINE_SKATING;
-        }
-        if (inList(resources, activityType, ESCOOTER_LIST)) {
-            return ESCOOTER;
-        }
-        if (inList(resources, activityType, RUN_LIST)) {
-            return RUN;
-        }
-        if (inList(resources, activityType, SKI_LIST)) {
-            return SKI;
-        }
-        if (inList(resources, activityType, SNOW_BOARDING_LIST)) {
-            return SNOW_BOARDING;
-        }
-        if (inList(resources, activityType, SKATE_BOARDING_LIST)) {
-            return SKATE_BOARDING;
-        }
-        if (inList(resources, activityType, WALK_LIST)) {
-            return WALK;
-        }
-        if (inList(resources, activityType, SWIM_LIST)) {
-            return SWIMMING;
-        }
-        if (inList(resources, activityType, WORKOUT_LIST)) {
-            return WORKOUT;
-        }
-        return UNKNOWN;
+        return selected.get().getId();
     }
 
-    /**
-     * Returns true if the activity type is in the list.
-     *
-     * @param context      the context
-     * @param activityType the activity type
-     * @param list         the list
-     */
-    private static boolean inList(Resources context, String activityType, int[] list) {
-        for (int i : list) {
-            if (context.getString(i).equals(activityType)) {
-                return true;
-            }
-        }
-        return false;
-    }
+    public static boolean isSpeedIcon(Resources resources, String activityTypeId) {
+        Optional<ActivityType> selected = Arrays.stream(ActivityType.values())
+                .filter(
+                        it -> Arrays.stream(it.getLocalizedStringIds())
+                                .anyMatch(id -> resources.getString(id).equals(activityTypeId))
+                )
+                .findFirst();
 
-    /**
-     * Returns true if category is in the SPEED_ICON array. Otherwise returns false.
-     *
-     * @param category the name of the category, activity type.
-     */
-    public static boolean isSpeedIcon(Resources resources, String category) {
-        return inList(resources, category, SPEED_ICON);
+        if (selected.isEmpty()) {
+            return false;
+        }
+
+        return selected.get().isShowSpeedPreferred();
     }
 }

src/main/java/de/dennisguse/opentracks/viewmodels/GenericStatisticsViewHolder.java

@@ -4,8 +4,6 @@ import android.util.Pair;
 import android.view.LayoutInflater;
 import android.view.View;
 
-import androidx.core.content.ContextCompat;
-
 import de.dennisguse.opentracks.R;
 import de.dennisguse.opentracks.data.models.DistanceFormatter;
 import de.dennisguse.opentracks.data.models.HeartRateZones;
@@ -274,10 +272,10 @@ public abstract class GenericStatisticsViewHolder extends StatisticViewHolder<St
             if (sensorDataSet != null && sensorDataSet.getHeartRate() != null) {
                 valueAndUnit = StringUtils.getHeartRateParts(getContext(), sensorDataSet.getHeartRate().first);
                 sensorName = sensorDataSet.getHeartRate().second;
-                textColor = zones.getColorForZone(sensorDataSet.getHeartRate().first);
+                textColor = zones.getTextColorForZone(getContext(), sensorDataSet.getHeartRate().first);
             } else {
                 valueAndUnit = StringUtils.getHeartRateParts(getContext(), null);
-                textColor = zones.getColorForZone(null);
+                textColor = zones.getTextColorForZone(getContext(), null);
             }
 
             getBinding().statsValue.setText(valueAndUnit.first);
@@ -287,7 +285,7 @@ public abstract class GenericStatisticsViewHolder extends StatisticViewHolder<St
             getBinding().statsDescriptionSecondary.setVisibility(View.VISIBLE);
             getBinding().statsDescriptionSecondary.setText(sensorName);
 
-            getBinding().statsValue.setTextColor(ContextCompat.getColor(getContext(), textColor));
+            getBinding().statsValue.setTextColor(textColor);
         }
     }
 

src/main/res/values/colors.xml

@@ -61,5 +61,4 @@ limitations under the License.
     <color name="heart_rate_zone_textcolor_4">#FFBD04</color>
     <color name="heart_rate_zone_textcolor_3">#6ACC2B</color>
     <color name="heart_rate_zone_textcolor_2">#64D1FD</color>
-    <color name="heart_rate_zone_textcolor_1">@color/opentracks_on_primary_color</color>
 </resources>

src/main/res/values/settings.xml

@@ -64,75 +64,6 @@
     <!-- Stats layout customization default layout -->
     <string name="default_activity_key" translatable="false">defaultActivity</string>
     <string name="default_activity_default" translatable="false">@string/activity_type_unknown</string>
-    <string-array name="activity_types">
-        <item>@string/default_activity_default</item>
-
-        <item>@string/activity_type_airplane</item>
-        <item>@string/activity_type_atv</item>
-        <item>@string/activity_type_biking</item>
-        <item>@string/activity_type_blimp</item>
-        <item>@string/activity_type_boat</item>
-        <item>@string/activity_type_climbing</item>
-        <item>@string/activity_type_commercial_airplane</item>
-        <item>@string/activity_type_cross_country_skiing</item>
-        <item>@string/activity_type_cycling</item>
-        <item>@string/activity_type_dirt_bike</item>
-        <item>@string/activity_type_donkey_back_riding</item>
-        <item>@string/activity_type_driving</item>
-        <item>@string/activity_type_driving_bus</item>
-        <item>@string/activity_type_driving_car</item>
-        <item>@string/activity_type_ferry</item>
-        <item>@string/activity_type_frisbee</item>
-        <item>@string/activity_type_gliding</item>
-        <item>@string/activity_type_hang_gliding</item>
-        <item>@string/activity_type_helicopter</item>
-        <item>@string/activity_type_hiking</item>
-        <item>@string/activity_type_horse_back_riding</item>
-        <item>@string/activity_type_hot_air_balloon</item>
-        <item>@string/activity_type_ice_sailing</item>
-        <item>@string/activity_type_inline_skating</item>
-        <item>@string/activity_type_kayaking</item>
-        <item>@string/activity_type_kite_surfing</item>
-        <item>@string/activity_type_land_sailing</item>
-        <item>@string/activity_type_mixed_type</item>
-        <item>@string/activity_type_motor_bike</item>
-        <item>@string/activity_type_motor_boating</item>
-        <item>@string/activity_type_mountain_biking</item>
-        <item>@string/activity_type_off_trail_hiking</item>
-        <item>@string/activity_type_other</item>
-        <item>@string/activity_type_paddling</item>
-        <item>@string/activity_type_para_gliding</item>
-        <item>@string/activity_type_rc_airplane</item>
-        <item>@string/activity_type_rc_boat</item>
-        <item>@string/activity_type_rc_helicopter</item>
-        <item>@string/activity_type_riding</item>
-        <item>@string/activity_type_road_biking</item>
-        <item>@string/activity_type_roller_skiing</item>
-        <item>@string/activity_type_rowing</item>
-        <item>@string/activity_type_running</item>
-        <item>@string/activity_type_sailing</item>
-        <item>@string/activity_type_seaplane</item>
-        <item>@string/activity_type_skate_boarding</item>
-        <item>@string/activity_type_skating</item>
-        <item>@string/activity_type_skiing</item>
-        <item>@string/activity_type_sky_jumping</item>
-        <item>@string/activity_type_sled</item>
-        <item>@string/activity_type_snow_boarding</item>
-        <item>@string/activity_type_snow_shoeing</item>
-        <item>@string/activity_type_speed_walking</item>
-        <item>@string/activity_type_street_running</item>
-        <item>@string/activity_type_surfing</item>
-        <item>@string/activity_type_track_cycling</item>
-        <item>@string/activity_type_track_running</item>
-        <item>@string/activity_type_trail_hiking</item>
-        <item>@string/activity_type_trail_running</item>
-        <item>@string/activity_type_train</item>
-        <item>@string/activity_type_ultimate_frisbee</item>
-        <item>@string/activity_type_wakeboarding</item>
-        <item>@string/activity_type_walking</item>
-        <item>@string/activity_type_water_skiing</item>
-        <item>@string/activity_type_wind_surfing</item>
-    </string-array>
 
     <string name="recording_distance_interval_key" translatable="false">recordingDistanceInterval</string>
     <string name="recording_distance_interval_default" translatable="false">10</string>