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

Cleanup: reference resources manually.

Browse Source
This commit is contained in:
Dennis Guse
2021-12-19 12:48:33 +01:00
parent 0977d34889
commit 03d825d2ec
1 changed files with 27 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/de/dennisguse/opentracks/settings/PreferencesUtils.java
+27 -25
View File
@@ -32,12 +32,11 @@ import androidx.documentfile.provider.DocumentFile;
import androidx.preference.PreferenceManager; import androidx.preference.PreferenceManager;
import java.time.Duration; import java.time.Duration;
import java.lang.reflect.Field;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Optional; import java.util.Optional;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import java.util.stream.Stream;
import de.dennisguse.opentracks.R; import de.dennisguse.opentracks.R;
import de.dennisguse.opentracks.content.data.Distance; import de.dennisguse.opentracks.content.data.Distance;
@@ -96,7 +95,7 @@ public class PreferencesUtils {
/** /**
* Gets a preference key * Gets a preference key
* *
* @param keyId the key id * @param keyId the key id
*/ */
private static String getKey(int keyId) { private static String getKey(int keyId) {
return resources.getString(keyId); return resources.getString(keyId);
@@ -114,7 +113,7 @@ public class PreferencesUtils {
} }
public static boolean isKey(int[] keyIds, String key) { public static boolean isKey(int[] keyIds, String key) {
for(int keyId : keyIds) { for (int keyId : keyIds) {
if (isKey(keyId, key)) { if (isKey(keyId, key)) {
return true; return true;
} }
@@ -187,7 +186,7 @@ public class PreferencesUtils {
} else { } else {
unit = resources.getString(R.string.stats_units_imperial); unit = resources.getString(R.string.stats_units_imperial);
} }
setString( R.string.stats_units_key, unit); setString(R.string.stats_units_key, unit);
} }
public static boolean isReportSpeed(String category) { public static boolean isReportSpeed(String category) {
@@ -552,30 +551,33 @@ public class PreferencesUtils {
return resources.getInteger(R.integer.stats_custom_layout_columns_default); return resources.getInteger(R.integer.stats_custom_layout_columns_default);
} }
private static List<TypedArray> getMultiTypedArray(String key) { private static List<TypedArray> getMultiTypedArray() {
List<TypedArray> typedArrays = new ArrayList<>(); return Stream.of(
R.array.stats_custom_layout_fields_default_value_0,
try { R.array.stats_custom_layout_fields_default_value_1,
Class<R.array> resource = R.array.class; R.array.stats_custom_layout_fields_default_value_2,
Field field; R.array.stats_custom_layout_fields_default_value_3,
int i = 0; R.array.stats_custom_layout_fields_default_value_4,
R.array.stats_custom_layout_fields_default_value_5,
do { R.array.stats_custom_layout_fields_default_value_6,
field = resource.getField(key + resources.getString(R.string.stats_custom_layout_fields_default_value_separator) + i); R.array.stats_custom_layout_fields_default_value_7,
typedArrays.add(resources.obtainTypedArray(field.getInt(null))); R.array.stats_custom_layout_fields_default_value_8,
i++; R.array.stats_custom_layout_fields_default_value_9,
} while (field != null); //TODO Catch no such field exception instead of using an endless loop. R.array.stats_custom_layout_fields_default_value_10,
} catch (Exception e) { R.array.stats_custom_layout_fields_default_value_11,
e.printStackTrace(); R.array.stats_custom_layout_fields_default_value_12,
Log.e(TAG, e.getMessage()); R.array.stats_custom_layout_fields_default_value_13,
} R.array.stats_custom_layout_fields_default_value_14,
R.array.stats_custom_layout_fields_default_value_15,
return typedArrays; R.array.stats_custom_layout_fields_default_value_16,
R.array.stats_custom_layout_fields_default_value_17,
R.array.stats_custom_layout_fields_default_value_18
).map(id -> resources.obtainTypedArray(id)).collect(Collectors.toList());
} }
@SuppressLint("ResourceType") @SuppressLint("ResourceType")
private static String buildDefaultFields() { private static String buildDefaultFields() {
List<TypedArray> fieldsArrays = getMultiTypedArray("stats_custom_layout_fields_default_value"); List<TypedArray> fieldsArrays = getMultiTypedArray();
return fieldsArrays.stream().map(i -> i.getString(0) + CsvLayoutUtils.PROPERTY_SEPARATOR + i.getString(1)).collect(Collectors.joining(CsvLayoutUtils.ITEM_SEPARATOR)) return fieldsArrays.stream().map(i -> i.getString(0) + CsvLayoutUtils.PROPERTY_SEPARATOR + i.getString(1)).collect(Collectors.joining(CsvLayoutUtils.ITEM_SEPARATOR))
+ CsvLayoutUtils.ITEM_SEPARATOR; + CsvLayoutUtils.ITEM_SEPARATOR;
} }