karol/OpenTracks
1
0
Fork 0
forked from upstream-mirrors/OpenTracks
Code Pull Requests Actions Releases 2 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/util/TrackIconUtils.java
-53
View File
@@ -1,53 +0,0 @@
/*
* Copyright 2012 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.util;
import android.content.Context;
import android.content.res.Resources;
import androidx.annotation.NonNull;
import de.dennisguse.opentracks.data.models.ActivityType;
/**
* Utilities for track icon.
*
* @author Jimmy Shih
*/
public class TrackIconUtils {
public static int getIconDrawableId(String activityTypeId) {
return ActivityType.findByActivityTypeId(activityTypeId)
.getIconDrawableId();
}
public static int getIconActivityType(String activityTypeId) {
return ActivityType.findByActivityTypeId(activityTypeId)
.getFirstLocalizedStringId();
}
@NonNull
public static String getActivityTypeId(Context context, String localizedActivityType) {
return ActivityType.findByLocalizedString(context, localizedActivityType)
.getId();
}
public static boolean isSpeedIcon(Resources resources, String localizedActivityType) {
return ActivityType.findByLocalizedString(resources, localizedActivityType)
.isShowSpeedPreferred();
}
}
src/main/java/de/dennisguse/opentracks/util/TrackUtils.java
+5 -2
View File
@@ -19,6 +19,7 @@ package de.dennisguse.opentracks.util;
import android.content.Context;
import de.dennisguse.opentracks.data.ContentProviderUtils;
import de.dennisguse.opentracks.data.models.ActivityType;
import de.dennisguse.opentracks.data.models.Track;
/**
@@ -33,7 +34,8 @@ public class TrackUtils {
}
public static void updateTrack(Context context, Track track, String name, String activityType, String description, ContentProviderUtils contentProviderUtils) {
updateTrack(context, track, name, activityType, TrackIconUtils.getActivityTypeId(context, activityType), description, contentProviderUtils);
updateTrack(context, track, name, activityType, ActivityType.findByLocalizedString(context, activityType)
.getId(), description, contentProviderUtils);
}
public static void updateTrack(Context context, Track track, String name, String activityType, String iconValue, String description, ContentProviderUtils contentProviderUtils) {
@@ -49,7 +51,8 @@ public class TrackUtils {
if (iconValue != null) {
track.setIcon(iconValue);
} else if (activityType != null) {
track.setIcon(TrackIconUtils.getActivityTypeId(context, activityType));
track.setIcon(ActivityType.findByLocalizedString(context, activityType)
.getId());
}
if (description != null) {
track.setDescription(description);