upstream-mirrors/OpenTracks
1
0
Fork 1
mirror of https://codeberg.org/OpenTracksApp/OpenTracks.git synced 2026-10-07 20:03:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup: inline TrackIconUtils methods.

Browse Source 
Part of #1608.
This commit is contained in:
Dennis Guse
2023-06-23 07:36:58 +02:00
parent d316a63fca
commit f824b31891
14 changed files with 82 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/de/dennisguse/opentracks/ui/aggregatedStatistics/AggregatedStatisticsAdapter.java
+11 -4
View File
@@ -1,6 +1,7 @@
package de.dennisguse.opentracks.ui.aggregatedStatistics;
import android.content.Context;
import android.content.res.Resources;
import android.util.Pair;
import android.view.LayoutInflater;
import android.view.View;
@@ -13,12 +14,12 @@ import java.util.ArrayList;
import java.util.List;
import de.dennisguse.opentracks.R;
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.settings.PreferencesUtils;
import de.dennisguse.opentracks.settings.UnitSystem;
import de.dennisguse.opentracks.util.StringUtils;
import de.dennisguse.opentracks.util.TrackIconUtils;
public class AggregatedStatisticsAdapter extends BaseAdapter {
@@ -62,7 +63,10 @@ public class AggregatedStatisticsAdapter extends BaseAdapter {
viewHolder = (ViewHolder) convertView.getTag();
}
if (TrackIconUtils.isSpeedIcon(context.getResources(), aggregatedStatistic.getActivityType())) {
Resources resources = context.getResources();
String localizedActivityType = aggregatedStatistic.getActivityType();
if (ActivityType.findByLocalizedString(resources, localizedActivityType)
.isShowSpeedPreferred()) {
viewHolder.setSpeed(aggregatedStatistic);
} else {
viewHolder.setPace(aggregatedStatistic);
@@ -178,8 +182,11 @@ public class AggregatedStatisticsAdapter extends BaseAdapter {
}
private int getIcon(AggregatedStatistics.AggregatedStatistic aggregatedStatistic) {
String iconValue = TrackIconUtils.getActivityTypeId(context, aggregatedStatistic.getActivityType());
return TrackIconUtils.getIconDrawableId(iconValue);
String localizedActivityType = aggregatedStatistic.getActivityType();
String iconValue = ActivityType.findByLocalizedString(context, localizedActivityType)
.getId();
return ActivityType.findByActivityTypeId(iconValue)
.getIconDrawableId();
}
}
}