karol/OpenTracks
1
0
Fork 0
forked from upstream-mirrors/OpenTracks
Code Pull Requests Actions Releases 2 Activity

Cleanup: ActivityType lookup.

Browse Source 
Part of #1608.
This commit is contained in:
Dennis Guse
2023-06-23 07:35:39 +02:00
parent 55cf60ef2f
commit d316a63fca
14 changed files with 79 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/de/dennisguse/opentracks/settings/ActivityTypePreference.java
+4 -4
View File
@@ -83,12 +83,12 @@ public class ActivityTypePreference extends DialogPreference {
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));
String iconValue = TrackIconUtils.getActivityTypeId(context, (String) textView.getAdapter().getItem(position));
updateIcon(iconValue);
});
textView.setOnFocusChangeListener((v, hasFocus) -> {
if (!hasFocus) {
String iconValue = TrackIconUtils.getIconValue(context, textView.getText().toString());
String iconValue = TrackIconUtils.getActivityTypeId(context, textView.getText().toString());
updateIcon(iconValue);
}
});
@@ -96,7 +96,7 @@ public class ActivityTypePreference extends DialogPreference {
iconView = view.findViewById(R.id.activity_type_preference_spinner);
iconView.setOnClickListener((it) -> showIconSelectDialog());
updateIcon(TrackIconUtils.getIconValue(context, category));
updateIcon(TrackIconUtils.getActivityTypeId(context, category));
}
private void showIconSelectDialog() {
@@ -122,7 +122,7 @@ public class ActivityTypePreference extends DialogPreference {
}
private void updateIcon(String iconValue) {
iconView.setImageResource(TrackIconUtils.getIconDrawable(iconValue));
iconView.setImageResource(TrackIconUtils.getIconDrawableId(iconValue));
}
}
}