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

Refactor Track.icon is now Track.activityTypeId.

Browse Source 
Part of #1608.
This commit is contained in:
Dennis Guse
2023-06-23 07:49:39 +02:00
parent f824b31891
commit 779681088c
14 changed files with 30 additions and 30 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
@@ -46,7 +46,7 @@ public class ActivityTypePreference extends DialogPreference {
setDialogIcon(null);
setPersistent(true);
SummaryProvider<DialogPreference> summaryProvider = preference -> PreferencesUtils.getDefaultActivity();
SummaryProvider<DialogPreference> summaryProvider = preference -> PreferencesUtils.getDefaultActivityTypeLocalized();
setSummaryProvider(summaryProvider);
}
@@ -77,7 +77,7 @@ public class ActivityTypePreference extends DialogPreference {
final Context context = getActivity();
textView = view.findViewById(R.id.activity_type_preference_text_view);
String category = PreferencesUtils.getDefaultActivity();
String category = PreferencesUtils.getDefaultActivityTypeLocalized();
textView.setText(category);
ArrayAdapter<String> adapter = new ArrayAdapter<>(context, android.R.layout.simple_dropdown_item_1line, ActivityType.getLocalizedStrings(context));
textView.setAdapter(adapter);
@@ -104,7 +104,7 @@ public class ActivityTypePreference extends DialogPreference {
}
private void showIconSelectDialog() {
String category = PreferencesUtils.getDefaultActivity();
String category = PreferencesUtils.getDefaultActivityTypeLocalized();
ChooseActivityTypeDialogFragment.showDialog(getActivity().getSupportFragmentManager(), category);
}
@@ -113,7 +113,7 @@ public class ActivityTypePreference extends DialogPreference {
if (positiveResult) {
String newDefaultActivity = textView.getText().toString();
if (getPreference().callChangeListener(newDefaultActivity)) {
PreferencesUtils.setDefaultActivity(newDefaultActivity);
PreferencesUtils.setDefaultActivityLocalized(newDefaultActivity);
HackUtils.invalidatePreference(getPreference());
}
}
src/main/java/de/dennisguse/opentracks/settings/PreferencesUtils.java
+2 -2
View File
@@ -90,11 +90,11 @@ public class PreferencesUtils {
sharedPreferences.unregisterOnSharedPreferenceChangeListener(changeListener);
}
public static String getDefaultActivity() {
public static String getDefaultActivityTypeLocalized() {
return getString(R.string.default_activity_key, resources.getString(R.string.default_activity_default));
}
public static void setDefaultActivity(String newDefaultActivity) {
public static void setDefaultActivityLocalized(String newDefaultActivity) {
setString(R.string.default_activity_key, newDefaultActivity);
}