diff --git a/src/pandroid/app/build.gradle.kts b/src/pandroid/app/build.gradle.kts index 91a36c6e..276eb552 100644 --- a/src/pandroid/app/build.gradle.kts +++ b/src/pandroid/app/build.gradle.kts @@ -39,5 +39,4 @@ dependencies { implementation("androidx.appcompat:appcompat:1.6.1") implementation("com.google.android.material:material:1.8.0") implementation("androidx.constraintlayout:constraintlayout:2.1.4") - implementation("com.google.code.gson:gson:2.10.1") } \ No newline at end of file diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/config/GlobalConfig.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/config/GlobalConfig.java index 40a1ebec..d1427dba 100644 --- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/config/GlobalConfig.java +++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/data/config/GlobalConfig.java @@ -16,24 +16,24 @@ public class GlobalConfig { .getSharedPreferences(Constants.PREF_GLOBAL_CONFIG, Context.MODE_PRIVATE); } - private static T get(Key key) { + public static T get(Key key) { Serializable value; - if (key.defValue instanceof String) { - value = data.getString(key.name, (String) key.defValue); - } else if (key.defValue instanceof Integer) { - value = data.getInt(key.name, (int) key.defValue); - } else if (key.defValue instanceof Boolean) { - value = data.getBoolean(key.name, (Boolean) key.defValue); - } else if (key.defValue instanceof Long) { - value = data.getLong(key.name, (Long) key.defValue); + if (key.defaultValue instanceof String) { + value = data.getString(key.name, (String) key.defaultValue); + } else if (key.defaultValue instanceof Integer) { + value = data.getInt(key.name, (int) key.defaultValue); + } else if (key.defaultValue instanceof Boolean) { + value = data.getBoolean(key.name, (boolean) key.defaultValue); + } else if (key.defaultValue instanceof Long) { + value = data.getLong(key.name, (long) key.defaultValue); } else { - value = data.getFloat(key.name, ((Number) key.defValue).floatValue()); + value = data.getFloat(key.name, (float) key.defaultValue); } return (T) value; } //Need synchronized why SharedPreferences don't support aysnc write - private static synchronized void set(Key key, T value) { + public static synchronized void set(Key key, T value) { if (value instanceof String) { data.edit().putString(key.name, (String) value).apply(); } else if (value instanceof Integer) { @@ -51,11 +51,11 @@ public class GlobalConfig { private static class Key { private final String name; - private final T defValue; + private final T defaultValue; - private Key(String name, T defValue) { + private Key(String name, T defaultValue) { this.name = name; - this.defValue = defValue; + this.defaultValue = defaultValue; } } } \ No newline at end of file diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/lang/Function.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/lang/Function.java deleted file mode 100644 index c5e6a4f4..00000000 --- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/lang/Function.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.panda3ds.pandroid.lang; - -public interface Function { - void run(T val); -}